rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Ludovic Courtès 2016-01-05 13:58:36 +01:00
parent a2ab82db9a
commit e8e2e18b84
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/cmake.scm
View File

@ -77,7 +77,7 @@ archive_write_set_format_shar.c"
;; Help cmake's bootstrap process to find system libraries ;; Help cmake's bootstrap process to find system libraries
(begin (begin
(setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (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 ;; Get verbose output from failed tests
(setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE"))) (setenv "CTEST_OUTPUT_ON_FAILURE" "TRUE")))
(alist-replace (alist-replace

6
gnu/packages/cross-base.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -181,12 +181,14 @@ may be either a libc package or #f.)"
(string-append libc "/lib")) (string-append libc "/lib"))
(let ((cpath (search-path-as-string->list (let ((cpath (search-path-as-string->list
(getenv "CPATH"))) (getenv "C_INCLUDE_PATH")))
(libpath (search-path-as-string->list (libpath (search-path-as-string->list
(getenv "LIBRARY_PATH")))) (getenv "LIBRARY_PATH"))))
(setenv "CPATH" (setenv "CPATH"
(list->search-path-as-string (list->search-path-as-string
(remove cross? cpath) ":")) (remove cross? cpath) ":"))
(for-each unsetenv
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
(setenv "LIBRARY_PATH" (setenv "LIBRARY_PATH"
(list->search-path-as-string (list->search-path-as-string
(remove cross? libpath) ":")) (remove cross? libpath) ":"))

4
gnu/packages/package-management.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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")) (let ((nspr (assoc-ref inputs "nspr"))
(nss (assoc-ref inputs "nss"))) (nss (assoc-ref inputs "nss")))
(setenv "CPATH" (setenv "CPATH"
(string-append (getenv "CPATH") ":" (string-append (getenv "C_INCLUDE_PATH") ":"
nspr "/include/nspr:" nspr "/include/nspr:"
nss "/include/nss")) nss "/include/nss"))
(setenv "LIBRARY_PATH" (setenv "LIBRARY_PATH"

2
gnu/packages/video.scm
View File

@ -1057,7 +1057,7 @@ for use with HTML5 video.")
(lambda _ (lambda _
;; Copy-paste settings from the cmake build system. ;; Copy-paste settings from the cmake build system.
(setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH")) (setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
(setenv "CMAKE_INCLUDE_PATH" (getenv "CPATH"))) (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")))
(alist-replace 'build (alist-replace 'build
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* (let*

2
gnu/packages/webkit.scm
View File

@ -80,7 +80,7 @@
;; that it will be in the same directory as gstreamer's header ;; that it will be in the same directory as gstreamer's header
;; files. ;; files.
(setenv "CPATH" (setenv "CPATH"
(string-append (getenv "CPATH") (string-append (getenv "C_INCLUDE_PATH")
":" ":"
(assoc-ref inputs "gst-plugins-base") (assoc-ref inputs "gst-plugins-base")
"/include/gstreamer-1.0"))))))) "/include/gstreamer-1.0")))))))