* [bug#73994] [PATCH] gnu: bpftrace: Update to 1.21.2.
@ 2024-10-24 19:43 Ashish SHUKLA via Guix-patches via
2024-10-28 4:34 ` Z572
0 siblings, 1 reply; 2+ messages in thread
From: Ashish SHUKLA via Guix-patches via @ 2024-10-24 19:43 UTC (permalink / raw)
To: 73994; +Cc: Ashish SHUKLA, Leo Famulari, Wilko Meyer
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#73994] [PATCH] gnu: bpftrace: Update to 1.21.2.
2024-10-24 19:43 [bug#73994] [PATCH] gnu: bpftrace: Update to 1.21.2 Ashish SHUKLA via Guix-patches via
@ 2024-10-28 4:34 ` Z572
0 siblings, 0 replies; 2+ messages in thread
From: Z572 @ 2024-10-28 4:34 UTC (permalink / raw)
To: 73994; +Cc: Wilko Meyer, Leo Famulari, 73994-done, Ashish SHUKLA
[-- Attachment #1: Type: text/plain, Size: 2563 bytes --]
Ashish SHUKLA via Guix-patches via <guix-patches@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-28 4:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-24 19:43 [bug#73994] [PATCH] gnu: bpftrace: Update to 1.21.2 Ashish SHUKLA via Guix-patches via
2024-10-28 4:34 ` Z572
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.