nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: criu: Fix build with GCC 7. 

* gnu/packages/virtualization.scm (criu)[arguments]: Do not read from
C_INCLUDE_PATH, but add LINUX-LIBRE-HEADERS on it.
This commit is contained in:
Marius Bakke 2019-07-14 18:13:59 +02:00
parent 97149c5767
commit a46cf184fe
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/packages/virtualization.scm
View File

@ -694,8 +694,14 @@ domains, their live performance and resource utilization statistics.")
;; The includes for libnl are located in a sub-directory. ;; The includes for libnl are located in a sub-directory.
(setenv "C_INCLUDE_PATH" (setenv "C_INCLUDE_PATH"
(string-append (assoc-ref inputs "libnl") (string-append (assoc-ref inputs "libnl")
"/include/libnl3:" "/include/libnl3"
(getenv "C_INCLUDE_PATH"))) ;; Also add the kernel headers here so that GCC
;; treats them as "system headers". Otherwise
;; the build fails with -Werror because parasite.c
;; includes both <linux/fs.h> and <sys/mount.h>,
;; which define some of the same constants.
(assoc-ref inputs "kernel-headers")
"/include"))
;; Prevent xmlto from failing the install phase. ;; Prevent xmlto from failing the install phase.
(substitute* "Documentation/Makefile" (substitute* "Documentation/Makefile"
(("XMLTO.*:=.*") (("XMLTO.*:=.*")