[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/29: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libr
From: |
guix-commits |
Subject: |
23/29: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries. |
Date: |
Sat, 9 Feb 2019 15:55:26 -0500 (EST) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 546bee40023687e52aff457b3b487cd47d751548
Author: Marius Bakke <address@hidden>
Date: Sat Oct 6 14:48:07 2018 +0200
gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries.
* gnu/packages/cmake.scm (cmake)[arguments]: Try both CPATH and
C_INCLUDE_PATH
instead of just the latter.
---
gnu/packages/cmake.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm
index 7186cf9..5bd91b7 100644
--- a/gnu/packages/cmake.scm
+++ b/gnu/packages/cmake.scm
@@ -116,7 +116,8 @@
;; Help cmake's bootstrap process to find system libraries
(begin
(setenv "CMAKE_LIBRARY_PATH" (getenv "LIBRARY_PATH"))
- (setenv "CMAKE_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))
+ (setenv "CMAKE_INCLUDE_PATH" (or (getenv "CPATH")
+ (getenv "C_INCLUDE_PATH")))
#t)))
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
- 05/29: gnu: python-setuptools-scm: Update to 3.2.0., (continued)
- 05/29: gnu: python-setuptools-scm: Update to 3.2.0., guix-commits, 2019/02/09
- 06/29: gnu: python-hypothesis: Update to 4.5.3., guix-commits, 2019/02/09
- 09/29: gnu: python-coverage: Update to 4.5.2., guix-commits, 2019/02/09
- 11/29: gnu: python-pluggy: Update to 0.8.1., guix-commits, 2019/02/09
- 03/29: gnu: Tcl/Tk: Update to 8.6.9., guix-commits, 2019/02/09
- 14/29: gnu: python-more-itertools: Update to 5.0.0., guix-commits, 2019/02/09
- 15/29: gnu: python-setuptools: Update to 40.8.0., guix-commits, 2019/02/09
- 17/29: gnu: python-fonttools: Update to 3.37.3., guix-commits, 2019/02/09
- 16/29: gnu: python-freezegun: Update to 0.3.11., guix-commits, 2019/02/09
- 18/29: gnu: python-packaging: Update to 19.0., guix-commits, 2019/02/09
- 23/29: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries.,
guix-commits <=
- 21/29: gnu: glibc-final-with-bootstrap-bash: Don't enable obsolete rpc., guix-commits, 2019/02/09
- 24/29: gnu: cppunit: Update to 1.14.0., guix-commits, 2019/02/09
- 07/29: gnu: Remove address@hidden, guix-commits, 2019/02/09
- 08/29: gnu: python-pycodestyle: Update to 2.5.0., guix-commits, 2019/02/09
- 13/29: gnu: python-configparser: Update to 3.7.1., guix-commits, 2019/02/09
- 19/29: gnu: python-dateutil: Update to 2.8.0., guix-commits, 2019/02/09
- 22/29: gnu: python: Fix FTBFS with GCC >= 6., guix-commits, 2019/02/09
- 25/29: gnu: swig: Fix FTBFS with GCC >= 6., guix-commits, 2019/02/09
- 27/29: gnu: libevdev: Fix FTBFS with GCC7., guix-commits, 2019/02/09
- 26/29: gnu: aspell: Fix FTBFS with GCC7., guix-commits, 2019/02/09