branch core-updates updated: gnu: criu: Remove obsolete workaround.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/core-updates by this push:
     new 41cb710  gnu: criu: Remove obsolete workaround.
41cb710 is described below

commit 41cb710f4a400e67914a2b51bd204184f2889308
Author: Marius Bakke <address@hidden>
AuthorDate: Sun Apr 5 16:33:19 2020 +0200

    gnu: criu: Remove obsolete workaround.
    
    * gnu/packages/virtualization.scm (criu)[arguments]: In the configure phase,
    do not add kernel headers on C_INLUDE_PATH.
---
 gnu/packages/virtualization.scm | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 9f80e33..4368949 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -730,13 +730,7 @@ domains, their live performance and resource utilization 
statistics.")
              (setenv "C_INCLUDE_PATH"
                      (string-append (assoc-ref inputs "libnl")
                                     "/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"))
+                                    (or (getenv "C_INCLUDE_PATH") "")))
              #t))
          (add-after 'configure 'fix-documentation
            (lambda* (#:key inputs outputs #:allow-other-keys)