guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/09: gnu: encfs: Fix build failure with GCC 7.


From: guix-commits
Subject: 05/09: gnu: encfs: Fix build failure with GCC 7.
Date: Fri, 18 Oct 2019 08:44:12 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 1df9245586939e5a359f8c486662642d9d5998b5
Author: Marius Bakke <address@hidden>
Date:   Fri Oct 18 14:18:21 2019 +0200

    gnu: encfs: Fix build failure with GCC 7.
    
    Fixes <https://bugs.gnu.org/37779>.
    Reported by Pierre Neidhardt <address@hidden>.
    
    * gnu/packages/crypto.scm (encfs)[arguments]: Add phase 
'patch-CMakeLists.txt'.
---
 gnu/packages/crypto.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index e8cf815..a8f60f1 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -211,6 +211,15 @@ OpenBSD tool of the same name.")
              (copy-recursively (assoc-ref inputs "googletest-source")
                                "vendor/github.com/google/googletest")
              #t))
+         (add-before 'configure 'patch-CMakeLists.txt
+           (lambda _
+             ;; Prevent CMake from adding libc on the system include path.
+             ;; Otherwise it will interfere with the libc used by GCC and
+             ;; ultimately cause #include_next errors.
+             (substitute* "CMakeLists.txt"
+               (("include_directories \\(SYSTEM \\$\\{Intl_INCLUDE_DIRS\\}\\)")
+                ""))
+             #t))
          (add-before 'check 'make-unittests
            (lambda _
              (invoke "make" "unittests"))))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]