04/04: gnu: criu: Fix build with GCC 7.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit a46cf184fecb62fe93f3510eb32cc4772cf51cb8
Author: Marius Bakke <address@hidden>
Date:   Sun Jul 14 18:13:59 2019 +0200

    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.
---
 gnu/packages/virtualization.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index a640a64..e9bf459 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -694,8 +694,14 @@ domains, their live performance and resource utilization 
statistics.")
              ;; The includes for libnl are located in a sub-directory.
              (setenv "C_INCLUDE_PATH"
                      (string-append (assoc-ref inputs "libnl")
-                                    "/include/libnl3:"
-                                    (getenv "C_INCLUDE_PATH")))
+                                    "/include/libnl3"
+                                    ;; 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.
              (substitute* "Documentation/Makefile"
                (("XMLTO.*:=.*")