GNU bug report logs - #73994
[PATCH] gnu: bpftrace: Update to 1.21.2.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 73994 in the body.
You can then email your comments to 73994 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ashish SHUKLA <ashish.is <at> lostca.se>
To: guix-patches <at> gnu.org
Cc: Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: [PATCH] gnu: bpftrace: Update to 1.21.2.
Date: Thu, 24 Oct 2024 21:43:12 +0200

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

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Z572 <zhengjunjie <at> iscas.ac.cn>
To: Ashish SHUKLA via Guix-patches via <guix-patches <at> gnu.org>
Cc: Wilko Meyer <w <at> wmeyer.eu>, Leo Famulari <leo <at> famulari.name>,
 73994-done <at> debbugs.gnu.org, Ashish SHUKLA <ashish.is <at> lostca.se>
Subject: Re: [bug#73994] [PATCH] gnu: bpftrace: Update to 1.21.2.
Date: Mon, 28 Oct 2024 12:34:57 +0800

[Message part 1 (text/plain, inline)]

Ashish SHUKLA via Guix-patches via <guix-patches <at> gnu.org> writes:

> 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

push, and move comments to code.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.