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

gnu: python: Honor 'C_INCLUDE_PATH'. 

This is a followup to 009b53fd.

* gnu/packages/patches/python-3-search-paths.patch: Check
'C_INCLUDE_PATH' instead of 'CPATH'.
* gnu/packages/patches/python-2.7-search-paths.patch: Likewise.
This commit is contained in:
Ludovic Courtès 2016-01-05 12:35:30 +01:00
parent 4f2ca23493
commit a2ab82db9a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/patches/python-2.7-search-paths.patch
View File

@ -1,5 +1,5 @@
Make sure the build system honors CPATH and LIBRARY_PATH when looking for Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when
headers and libraries. looking for headers and libraries.
--- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200 --- Python-2.7.10/setup.py 2015-10-07 18:33:18.125153186 +0200
+++ Python-2.7.10/setup.py 2015-10-07 18:33:47.497347552 +0200 +++ Python-2.7.10/setup.py 2015-10-07 18:33:47.497347552 +0200
@ -9,7 +9,7 @@ headers and libraries.
+ # Always honor these variables. + # Always honor these variables.
+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) + lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+ inc_dirs += os.getenv('CPATH', '').split(os.pathsep) + inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+ +
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if host_platform in ['osf1', 'unixware7', 'openunix8']: if host_platform in ['osf1', 'unixware7', 'openunix8']:

6
gnu/packages/patches/python-3-search-paths.patch
View File

@ -1,5 +1,5 @@
Make sure the build system honors CPATH and LIBRARY_PATH when looking for Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when
headers and libraries. looking for headers and libraries.
--- setup.py 2015-10-07 23:32:58.891329173 +0200 --- setup.py 2015-10-07 23:32:58.891329173 +0200
+++ setup.py 2015-10-07 23:46:29.653349924 +0200 +++ setup.py 2015-10-07 23:46:29.653349924 +0200
@ -13,7 +13,7 @@ headers and libraries.
- ] - ]
- inc_dirs = self.compiler.include_dirs + ['/usr/include'] - inc_dirs = self.compiler.include_dirs + ['/usr/include']
+ lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) + lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+ inc_dirs = os.getenv('CPATH', '').split(os.pathsep) + inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
else: else:
lib_dirs = self.compiler.library_dirs[:] lib_dirs = self.compiler.library_dirs[:]
inc_dirs = self.compiler.include_dirs[:] inc_dirs = self.compiler.include_dirs[:]