[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/05: gnu: efivar: Fix build failure with GCC7.
From: |
guix-commits |
Subject: |
05/05: gnu: efivar: Fix build failure with GCC7. |
Date: |
Thu, 28 Feb 2019 14:22:59 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit f90d6c3f69d51f10a47e78c6d57d8e59a7da337e
Author: Marius Bakke <address@hidden>
Date: Thu Feb 28 20:20:28 2019 +0100
gnu: efivar: Fix build failure with GCC7.
* gnu/packages/linux.scm (efivar)[arguments]: Add phase
'kernel-headers-are-system-headers'.
---
gnu/packages/linux.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 23dd3f1..8dd8e94 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4104,7 +4104,14 @@ under OpenGL graphics workloads.")
(string-append "LDFLAGS=-Wl,-rpath=" %output "/lib"))
#:phases
(modify-phases %standard-phases
- (delete 'configure))))
+ (delete 'configure)
+ (add-before 'build 'kernel-headers-are-system-headers
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((kernel-headers (assoc-ref inputs "kernel-headers")))
+ ;; Make sure the kernel headers are treated as system headers
+ ;; to suppress a conflict between "util.h" and <linux/fs.h>.
+ (setenv "C_INCLUDE_PATH" (string-append kernel-headers
"/include"))
+ #t))))))
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs