apteryx pushed a commit to branch master
in repository guix.
commit c11b7aacc255f4a594db3e607f38e2fb9e8045a5
Author: Maxim Cournoyer <maxim.courno...@gmail.com>
AuthorDate: Wed Mar 26 20:46:28 2025 +0900
gnu: libbpf: Install uAPI headers.
* gnu/packages/linux.scm (libbpf)
[phases] {install-linux-bpf-headers}: Replace with...
{install}: ... this new phase override.
Change-Id: I596c17dcf3af5bce70cffe6949443f4d409dda89
---
gnu/packages/linux.scm | 34 ++++++++++------------------------
1 file changed, 10 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 0a1507993e..4354d9b8b4 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -10639,30 +10639,16 @@ persistent over reboots.")
(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"))))))))
+ (replace 'install
+ (lambda* (#:key make-flags #:allow-other-keys #:rest args)
+ (apply (assoc-ref %standard-phases 'install)
+ (append args
+ (list #:make-flags
+ (append (list "install"
+ ;; Also install the kernel
+ ;; user API (uAPI) headers.
+ "install_uapi_headers")
+ make-flags)))))))))
(native-inputs (list linux-libre-headers-latest pkg-config))
(propagated-inputs (list elfutils zlib)) ;in Requires.private of libbpf.pc
(home-page "https://github.com/libbpf/libbpf";)
