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

gnu: Adjust uses of C{,PLUS}_INCLUDE_PATH for GCC 7. 

These variables are no longer set in the build environment by default.  GCC
still respects these search paths and treats them as "system headers" so we
can continue to use them, just not expect them to be available.

* gnu/packages/mpi.scm (openmpi)[arguments]: Do not attempt to read from
C_INCLUDE_PATH, nor CPLUS_INCLUDE_PATH.
* gnu/packages/games.scm (kiki)[arguments]: Likewise.
* gnu/packages/networking.scm (hcxtools)[arguments]: Likewise.
* gnu/packages/synergy.scm (synergy)[arguments]: Likewise.
* gnu/packages/bioinformatics.scm (gemma, sailfish)[arguments]: Likewise.
* gnu/packages/maths.scm (dune-alugrid)[arguments]: Likewise.
This commit is contained in:
Marius Bakke 2019-07-14 18:13:34 +02:00
parent ad60a3484c
commit 97149c5767
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
6 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/bioinformatics.scm
View File

@ -3260,9 +3260,7 @@ comment or quality sections.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Ensure that Eigen headers can be found ;; Ensure that Eigen headers can be found
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (getenv "CPLUS_INCLUDE_PATH") (string-append (assoc-ref inputs "eigen")
":"
(assoc-ref inputs "eigen")
"/include/eigen3")) "/include/eigen3"))
#t)) #t))
(add-before 'build 'bin-mkdir (add-before 'build 'bin-mkdir
@ -11697,9 +11695,7 @@ bytes of memory space, where n is the length of the string.")
;; Ensure that Eigen headers can be found ;; Ensure that Eigen headers can be found
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (getenv "CPLUS_INCLUDE_PATH") (string-append (assoc-ref inputs "eigen")
":"
(assoc-ref inputs "eigen")
"/include/eigen3")) "/include/eigen3"))
#t))))) #t)))))
(inputs (inputs

3
gnu/packages/games.scm
View File

@ -4175,8 +4175,7 @@ over 100 user-created campaigns.")
(string-append (assoc-ref inputs "sdl-union") (string-append (assoc-ref inputs "sdl-union")
"/include/SDL:" "/include/SDL:"
(assoc-ref inputs "python") (assoc-ref inputs "python")
"/include/python2.7:" "/include/python2.7"))
(getenv "CPLUS_INCLUDE_PATH")))
(substitute* "src/main/main.cpp" (substitute* "src/main/main.cpp"
(("#include <SDL.h>" line) (("#include <SDL.h>" line)
(string-append line " (string-append line "

3
gnu/packages/maths.scm
View File

@ -4740,8 +4740,7 @@ assemble global function spaces on finite-element grids.")
(add-after 'build 'build-tests (add-after 'build 'build-tests
(lambda* (#:key inputs make-flags #:allow-other-keys) (lambda* (#:key inputs make-flags #:allow-other-keys)
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "dune-grid") "/share:" (string-append (assoc-ref inputs "dune-grid") "/share"))
(getenv "CPLUS_INCLUDE_PATH")))
(apply invoke "make" "build_tests" make-flags)))))) (apply invoke "make" "build_tests" make-flags))))))
(inputs (inputs
`(("dune-common" ,dune-common) `(("dune-common" ,dune-common)

6
gnu/packages/mpi.scm
View File

@ -217,12 +217,10 @@ bind processes, and much more.")
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "C_INCLUDE_PATH" (setenv "C_INCLUDE_PATH"
(string-append (assoc-ref inputs "opensm") (string-append (assoc-ref inputs "opensm")
"/include/infiniband/:" "/include/infiniband"))
(getenv "C_INCLUDE_PATH")))
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "opensm") (string-append (assoc-ref inputs "opensm")
"/include/infiniband/:" "/include/infiniband"))
(getenv "CPLUS_INCLUDE_PATH")))
#t)) #t))
(add-before 'build 'remove-absolute (add-before 'build 'remove-absolute
(lambda _ (lambda _

3
gnu/packages/networking.scm
View File

@ -2289,8 +2289,7 @@ Ethernet and TAP interfaces is supported. Packet capture is also supported.")
(string-append (assoc-ref inputs "curl") "/include:" (string-append (assoc-ref inputs "curl") "/include:"
(assoc-ref inputs "libpcap") "/include:" (assoc-ref inputs "libpcap") "/include:"
(assoc-ref inputs "openssl") "/include:" (assoc-ref inputs "openssl") "/include:"
(assoc-ref inputs "zlib") "/include:" (assoc-ref inputs "zlib") "/include"))
(getenv "C_INCLUDE_PATH")))
#t))))) #t)))))
(home-page "https://github.com/ZerBea/hcxtools") (home-page "https://github.com/ZerBea/hcxtools")
(synopsis "Capture wlan traffic to hashcat and John the Ripper") (synopsis "Capture wlan traffic to hashcat and John the Ripper")

3
gnu/packages/synergy.scm
View File

@ -63,8 +63,7 @@
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(setenv "CPLUS_INCLUDE_PATH" (setenv "CPLUS_INCLUDE_PATH"
(string-append (assoc-ref inputs "avahi") (string-append (assoc-ref inputs "avahi")
"/include/avahi-compat-libdns_sd/:" "/include/avahi-compat-libdns_sd"))
(getenv "CPLUS_INCLUDE_PATH")))
;; See https://github.com/symless/synergy-core/pull/6359/ ;; See https://github.com/symless/synergy-core/pull/6359/
(substitute* "src/gui/src/ScreenSetupView.cpp" (substitute* "src/gui/src/ScreenSetupView.cpp"
(("#include <QtGui>" m) (("#include <QtGui>" m)