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

gnu: python: Fix FTBFS with GCC >= 6. 

* gnu/packages/patches/python-3-search-paths.patch: s/C_INCLUDE_PATH/CPATH.
* gnu/packages/patches/python-2.7-search-paths.patch: Ditto.
This commit is contained in:
Marius Bakke 2018-10-05 20:46:57 +02:00
parent 3670ea70e2
commit a1635de0ce
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when Make sure the build system honors CPATH and LIBRARY_PATH when
looking for 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
@ -9,7 +9,7 @@ looking for 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('C_INCLUDE_PATH', '').split(os.pathsep) + inc_dirs += os.getenv('CPATH', '').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']:

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

@ -1,4 +1,4 @@
Make sure the build system honors C_INCLUDE_PATH and LIBRARY_PATH when Make sure the build system honors CPATH and LIBRARY_PATH when
looking for 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
@ -10,7 +10,7 @@ looking for headers and libraries.
- lib_dirs = self.compiler.library_dirs + system_lib_dirs - lib_dirs = self.compiler.library_dirs + system_lib_dirs
- inc_dirs = self.compiler.include_dirs + system_include_dirs - inc_dirs = self.compiler.include_dirs + system_include_dirs
+ lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) + lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+ inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + inc_dirs = os.getenv('CPATH', '').split(os.pathsep)
else: else:
# Add the sysroot paths. 'sysroot' is a compiler option used to # Add the sysroot paths. 'sysroot' is a compiler option used to
# set the logical path of the standard system headers and # set the logical path of the standard system headers and