diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-03-26 20:46:28 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-03-27 21:11:26 +0900 |
| commit | c11b7aacc255f4a594db3e607f38e2fb9e8045a5 (patch) | |
| tree | 765e886f8a1ae61934e6fd8318ad8a3a973f5055 | |
| parent | 9bbaae304b4cd7bd0be06503a2e6e6adb24b6d4d (diff) | |
| download | guix-c11b7aacc255f4a594db3e607f38e2fb9e8045a5.tar.gz guix-c11b7aacc255f4a594db3e607f38e2fb9e8045a5.zip | |
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
| -rw-r--r-- | gnu/packages/linux.scm | 34 |
1 files 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") |