guix-commits
[Top][All Lists]
Advanced

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

01/03: gnu: swig: Fix FTBFS with GCC >= 6.


From: Marius Bakke
Subject: 01/03: gnu: swig: Fix FTBFS with GCC >= 6.
Date: Sun, 7 Oct 2018 09:00:06 -0400 (EDT)

mbakke pushed a commit to branch wip-gcc7
in repository guix.

commit d6a676ebdf40aa6e741e7b3c236351e17887db83
Author: Marius Bakke <address@hidden>
Date:   Sun Oct 7 13:46:32 2018 +0200

    gnu: swig: Fix FTBFS with GCC >= 6.
    
    * gnu/packages/swig.scm (swig)[arguments]: Add phase to remove -isystem flag
    to GCC.
---
 gnu/packages/swig.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm
index b931db4..d8727bc 100644
--- a/gnu/packages/swig.scm
+++ b/gnu/packages/swig.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2018 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,7 +49,14 @@
            ;; Required since Perl 5.26.0's removal of the current
            ;; working directory from @INC.
            ;; TODO Try removing this for later versions of SWIG.
-           (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t)))))
+           (lambda _ (setenv "PERL_USE_UNSAFE_INC" "1") #t))
+         (add-before 'configure 'workaround-gcc-bug
+           (lambda _
+             ;; XXX: Don't add the -isystem flag, or GCCs #include_next
+             ;; won't be able to find <stdlib.h>.
+             (substitute* "configure"
+               (("-isystem ") "-I"))
+             #t)))))
     (native-inputs `(("boost" ,boost)
                      ("pcre" ,pcre "bin")))       ;for 'pcre-config'
     (inputs `(;; Provide these to run the corresponding tests.



reply via email to

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