all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Ashish SHUKLA via Guix-patches via <guix-patches@gnu.org>
To: 73994@debbugs.gnu.org
Cc: Ashish SHUKLA <ashish.is@lostca.se>,
	Leo Famulari <leo@famulari.name>, Wilko Meyer <w@wmeyer.eu>
Subject: [bug#73994] [PATCH] gnu: bpftrace: Update to 1.21.2.
Date: Thu, 24 Oct 2024 21:43:12 +0200	[thread overview]
Message-ID: <3223c821d377cf78c51d25858cd5c91373ebebad.1729798992.git.ashish.is@lostca.se> (raw)

This patch also fixes broken compilation due to improper detection
of bfd features. This is taken from following upstream PR:

  https://github.com/bpftrace/bpftrace/pull/3332

* gnu/packages/linux.scm (bpftrace): Update to 1.21.2.
[arguments]<phases> Rename, and update "patch-paths" phase.

Change-Id: If7180d4da8073914172296f46a3427ccdff22478
---
 gnu/packages/linux.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index e0785cccf7..6578dd2e97 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -10343,7 +10343,7 @@ (define-public bpftool
 (define-public bpftrace
   (package
     (name "bpftrace")
-    (version "0.21.0")
+    (version "0.21.2")
     (source
      (origin
        (method git-fetch)
@@ -10352,7 +10352,7 @@ (define-public bpftrace
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "06yg3w80kdq0i003w2gvn0czbh8z9d3rfgmglp37dkir7g3dc6iz"))))
+        (base32 "0icbhf1wk523a7lcmwqa67zc6hl6h02p5mfg26cizva447kbwsgz"))))
     (build-system cmake-build-system)
     (arguments (list #:configure-flags #~(list "-DBUILD_TESTING=ON")
                      ;; Only run the unit tests suite, as the other ones
@@ -10360,8 +10360,14 @@ (define-public bpftrace
                      ;; 'root'.
                      #:test-target "bpftrace_test"
                      #:phases #~(modify-phases %standard-phases
-                                  (add-after 'unpack 'patch-paths
+                                  (add-after 'unpack 'patch-paths-and-bfd-defs
                                     (lambda _
+                                      (substitute* '("cmake/FindLibBfd.cmake"
+                                                     "src/CMakeLists.txt")
+                                        (("LIBSFRAME_FOUND")
+                                         "LIBSFRAME_LIBRARIES")
+                                        (("LIBZSTD_FOUND")
+                                         "LIBZSTD_LIBRARIES"))
                                       (with-directory-excursion "tests"
                                         (substitute* (find-files ".")
                                           (("/bin/sh")

base-commit: 2394a7f5fbf60dd6adc0a870366adb57166b6d8b
-- 
2.47.0





             reply	other threads:[~2024-10-24 19:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-24 19:43 Ashish SHUKLA via Guix-patches via [this message]
2024-10-28  4:34 ` [bug#73994] [PATCH] gnu: bpftrace: Update to 1.21.2 Z572

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3223c821d377cf78c51d25858cd5c91373ebebad.1729798992.git.ashish.is@lostca.se \
    --to=guix-patches@gnu.org \
    --cc=73994@debbugs.gnu.org \
    --cc=ashish.is@lostca.se \
    --cc=leo@famulari.name \
    --cc=w@wmeyer.eu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.