[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#70962] [PATCH 05/14] gnu: libbpf: Update to 1.4.1.
From: |
Maxim Cournoyer |
Subject: |
[bug#70962] [PATCH 05/14] gnu: libbpf: Update to 1.4.1. |
Date: |
Wed, 15 May 2024 12:57:15 -0400 |
* gnu/packages/linux.scm (libbpf): Update to 1.4.1.
[phases] {install-linux-bpf-headers}: New phase.
[native-inputs]: Add linux-libre-headers-6.8.
Change-Id: I969a017b0ed52c1a611b3fe0d90d5b8703d35e73
---
gnu/packages/linux.scm | 41 +++++++++++++++++++++++++++++++++--------
1 file changed, 33 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index dea203a692..cb348276e3 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9783,7 +9783,7 @@ (define-public cachefilesd
(define-public libbpf
(package
(name "libbpf")
- (version "0.8.1")
+ (version "1.4.1")
(source
(origin
(method git-fetch)
@@ -9793,7 +9793,7 @@ (define-public libbpf
(file-name (git-file-name name version))
(sha256
(base32
- "1zzpkk4x3f20483dzw43b3ml03d63vvkmqf4j8y3b61b67wm59bm"))))
+ "1d0bx4bmn80nkdh0dqjfwq6j37is3qwl49cjvx4yxb4vrxq3x05x"))))
(build-system gnu-build-system)
(arguments
(list
@@ -9802,12 +9802,37 @@ (define-public libbpf
#~(list (string-append "PREFIX=" #$output)
(string-append "LIBDIR=$(PREFIX)/lib")
(string-append "CC=" #$(cc-for-target)))
- #:phases #~(modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'pre-build
- (lambda _
- (chdir "src"))))))
- (native-inputs (list pkg-config))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'pre-build
+ (lambda _
+ (chdir "src")))
+ (add-after 'install 'install-linux-bpf-headers
+ ;; Workaround users such as 'dwarves' requiring btf_enum64
+ ;; definition from the kernel Linux >= 6 headers (see:
+ ;; https://github.com/acmel/dwarves/issues/49).
+ ;; TODO: Remove once our 'linux-libre-headers' package is
+ ;; upgraded to a >= 6 release.
+ (lambda _
+ (let ((linux-libre-headers #$(this-package-native-input
+ "linux-libre-headers")))
+ (for-each (lambda (f)
+ (install-file (string-append linux-libre-headers
+ "/include/" f)
+ (string-append #$output "/include/"
+ (dirname f))))
+ ;; This list contains btf.h and its transitive
+ ;; dependencies.
+ (list "asm/posix_types.h"
+ "asm/types.h"
+ "asm-generic/types.h"
+ "asm-generic/int-ll64.h"
+ "linux/btf.h"
+ "linux/posix_types.h"
+ "linux/stddef.h"
+ "linux/types.h"))))))))
+ (native-inputs (list linux-libre-headers-6.8 pkg-config))
(propagated-inputs (list elfutils zlib)) ;in Requires.private of libbpf.pc
(home-page "https://github.com/libbpf/libbpf")
(synopsis "BPF CO-RE (Compile Once – Run Everywhere)")
--
2.41.0
- [bug#70962] [PATCH 01/14] gnu: grpc: Modernize., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 03/14] gnu: Add valijson., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 02/14] gnu: grpc: Propagate abseil-cpp-cxxstd11., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 05/14] gnu: libbpf: Update to 1.4.1.,
Maxim Cournoyer <=
- [bug#70962] [PATCH 08/14] gnu: Add dwarves., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 12/14] gnu: linux-libre: Enable BTF debug info., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 10/14] gnu: make-linux-libre*: Run install targets in parallel., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 07/14] gnu: Add sysdig., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 04/14] gnu: libbpf: Use gexps., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 14/14] gnu: linux-libre-with-bpf: Deprecate in favor of linux-libre., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 06/14] gnu: Add falcosecurity-libs., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 13/14] gnu: linux-libre: Enable Zstd compression of kernel modules., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 11/14] gnu: linux: Turn %default-extra-linux-options into a procedure., Maxim Cournoyer, 2024/05/15
- [bug#70962] [PATCH 09/14] gnu: make-linux-libre*: Set KBUILD_BUILD_VERSION for reproducibility., Maxim Cournoyer, 2024/05/15