diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-05 13:58:36 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-05 14:11:54 +0100 |
| commit | e8e2e18b84eb8842a59be9bf7d49bb672260ae3a (patch) | |
| tree | f5b237e29d64ad6a2962af0251a39929e4a4d09c /gnu | |
| parent | a2ab82db9ab5d6db86762924d3016aed7c26c315 (diff) | |
| download | patches-e8e2e18b84eb8842a59be9bf7d49bb672260ae3a.tar patches-e8e2e18b84eb8842a59be9bf7d49bb672260ae3a.tar.gz | |
gnu: Read 'C_INCLUDE_PATH' instead of 'CPATH'.
This is a followup to 009b53fd.
* gnu/packages/cmake.scm (cmake)[arguments]: Use (getenv
"C_INCLUDE_PATH") instead of (getenv "CPATH").
* gnu/packages/package-management.scm (rpm)[arguments]: Likewise.
* gnu/packages/video.scm (avidemux)[arguments]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[arguments]: Likewise.
* gnu/packages/cross-base.scm (cross-gcc-arguments): Likewise, and unset
'C_INCLUDE_PATH' and 'CPLUS_INCLUDE_PATH'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/cmake.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/cross-base.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/video.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/webkit.scm | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 2efce6fd87..d75b9f62ef 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -77,7 +77,7 @@ archive_write_set_format_shar.c" ;; Help cmake's bootstrap process to find system libraries (begin (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH")) + (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) ;; Get verbose output from failed tests (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE"))) (alist-replace diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index d64cdd1272..cefe2f947f 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. @@ -181,12 +181,14 @@ may be either a libc package or #f.)" (string-append libc "/lib")) (let ((cpath (search-path-as-string->list - (getenv "CPATH"))) + (getenv "C_INCLUDE_PATH"))) (libpath (search-path-as-string->list (getenv "LIBRARY_PATH")))) (setenv "CPATH" (list->search-path-as-string (remove cross? cpath) ":")) + (for-each unsetenv + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH")) (setenv "LIBRARY_PATH" (list->search-path-as-string (remove cross? libpath) ":")) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 917464543c..b8d0c9c2ac 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. @@ -340,7 +340,7 @@ symlinks to the files in a common directory such as /usr/local.") (let ((nspr (assoc-ref inputs "nspr")) (nss (assoc-ref inputs "nss"))) (setenv "CPATH" - (string-append (getenv "CPATH") ":" + (string-append (getenv "C_INCLUDE_PATH") ":" nspr "/include/nspr:" nss "/include/nss")) (setenv "LIBRARY_PATH" diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f1089f76ca..63a623d05e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1057,7 +1057,7 @@ for use with HTML5 video.") (lambda _ ;; Copy-paste settings from the cmake build system. (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH"))) + (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))) (alist-replace 'build (lambda* (#:key inputs outputs #:allow-other-keys) (let* diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index bb041b1935..d22aacd12f 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -80,7 +80,7 @@ ;; that it will be in the same directory as gstreamer's header ;; files. (setenv "CPATH" - (string-append (getenv "CPATH") + (string-append (getenv "C_INCLUDE_PATH") ":" (assoc-ref inputs "gst-plugins-base") "/include/gstreamer-1.0"))))))) |