diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-06-11 23:52:15 +0200 |
| commit | a032b4454b3fc67e11e9fc2d8c2345288065fa29 (patch) | |
| tree | c208124b79dbd2224b68c52106aa72ff2ebfa7ab /gnu/packages/patches/python-3-search-paths.patch | |
| parent | b5724230fed2d043206df20d12a45bb962b7ee77 (diff) | |
| parent | 6321ce42ab4d9ab788d858cb19bde4aa7a0e3ecc (diff) | |
| download | guix-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar guix-a032b4454b3fc67e11e9fc2d8c2345288065fa29.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/python-3-search-paths.patch')
| -rw-r--r-- | gnu/packages/patches/python-3-search-paths.patch | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch index 7feddb8e30..73e3f4ccf5 100644 --- a/gnu/packages/patches/python-3-search-paths.patch +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -3,17 +3,14 @@ looking for headers and libraries. --- setup.py 2015-10-07 23:32:58.891329173 +0200 +++ setup.py 2015-10-07 23:46:29.653349924 +0200 -@@ -507,11 +507,8 @@ class PyBuildExt(build_ext): +@@ -575,8 +575,8 @@ # 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: -- lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -- ] -- inc_dirs = self.compiler.include_dirs + ['/usr/include'] +- lib_dirs = self.compiler.library_dirs + system_lib_dirs +- inc_dirs = self.compiler.include_dirs + system_include_dirs + lib_dirs = os.getenv('LIBRARY_PATH', '').split(os.pathsep) + inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) else: - lib_dirs = self.compiler.library_dirs[:] - inc_dirs = self.compiler.include_dirs[:] + # Add the sysroot paths. 'sysroot' is a compiler option used to + # set the logical path of the standard system headers and |