mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-16 11:55:27 -05:00
b15d1c467f
* gnu/packages/python.scm (python-3.7): Rename to ... (python-3.8): ... this. Update to 3.8.1. [source](patches): Add "python-3.8-fix-tests.patch". [source](snippet): Adjust for renamed file. (python-3): Alias to PYTHON-3.8. * gnu/packages/patches/python-3-search-paths.patch: Adjust for 3.8. * gnu/packages/patches/python-3.8-search-paths.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
25 lines
1.4 KiB
Diff
25 lines
1.4 KiB
Diff
Make sure the build system honors CPATH and LIBRARY_PATH when
|
|
looking for headers and libraries.
|
|
|
|
--- a/setup.py 2015-10-07 23:32:58.891329173 +0200
|
|
+++ b/setup.py 2015-10-07 23:46:29.653349924 +0200
|
|
@@ -676,15 +676,15 @@
|
|
# if a file is found in one of those directories, it can
|
|
# be assumed that no additional -I,-L directives are needed.
|
|
if not CROSS_COMPILING:
|
|
- self.lib_dirs = self.compiler.library_dirs + system_lib_dirs
|
|
- self.inc_dirs = self.compiler.include_dirs + system_include_dirs
|
|
+ self.lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep)
|
|
+ self.inc_dirs = os.getenv('CPATH', '').split(os.pathsep)
|
|
else:
|
|
# Add the sysroot paths. 'sysroot' is a compiler option used to
|
|
# set the logical path of the standard system headers and
|
|
# libraries.
|
|
- self.lib_dirs = (self.compiler.library_dirs +
|
|
+ self.lib_dirs = (os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep) +
|
|
sysroot_paths(('LDFLAGS', 'CC'), system_lib_dirs))
|
|
- self.inc_dirs = (self.compiler.include_dirs +
|
|
+ self.inc_dirs = (os.getenv('CROSS_CPATH', '').split(os.pathsep) +
|
|
sysroot_paths(('CPPFLAGS', 'CFLAGS', 'CC'),
|
|
system_include_dirs))
|
|
|