diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-10-08 00:05:34 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-10-08 00:05:34 +0200 |
| commit | 6a20289d5a38520fd79e80c256a0315c96a46347 (patch) | |
| tree | 453242901e55b21078e621aaccfe325109982b79 /gnu/packages/patches | |
| parent | afa181fff435b4e549092c2639e8165069082755 (diff) | |
| download | guix-6a20289d5a38520fd79e80c256a0315c96a46347.tar guix-6a20289d5a38520fd79e80c256a0315c96a46347.tar.gz | |
gnu: python: Simplify list of configure flags.
* gnu/packages/patches/python-2.7-search-paths.patch,
gnu/packages/patches/python-3-search-paths.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/python.scm (python-2)[source]: Use first patch.
[arguments]: Remove now unneeded CPPFLAGS and LDFLAGS.
(python)[source]: Use second patch.
(python-minimal)[arguments]: Remove CPPFLAGS and LDFLAGS.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/python-2.7-search-paths.patch | 16 | ||||
| -rw-r--r-- | gnu/packages/patches/python-3-search-paths.patch | 19 |
2 files changed, 35 insertions, 0 deletions
diff --git a/gnu/packages/patches/python-2.7-search-paths.patch b/gnu/packages/patches/python-2.7-search-paths.patch new file mode 100644 index 0000000000..6e5339f3a6 --- /dev/null +++ b/gnu/packages/patches/python-2.7-search-paths.patch @@ -0,0 +1,16 @@ +Make sure the build system honors CPATH and LIBRARY_PATH when 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:47.497347552 +0200 +@@ -526,6 +526,10 @@ class PyBuildExt(build_ext): + inc_dirs += ['/system/include', '/atheos/autolnk/include'] + inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) + ++ # Always honor these variables. ++ lib_dirs += os.getenv('LIBRARY_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) + if host_platform in ['osf1', 'unixware7', 'openunix8']: + lib_dirs += ['/usr/ccs/lib'] diff --git a/gnu/packages/patches/python-3-search-paths.patch b/gnu/packages/patches/python-3-search-paths.patch new file mode 100644 index 0000000000..547feae1b9 --- /dev/null +++ b/gnu/packages/patches/python-3-search-paths.patch @@ -0,0 +1,19 @@ +Make sure the build system honors CPATH and LIBRARY_PATH when 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): + # 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 = os.getenv('LIBRARY_PATH', '').split(os.pathsep) ++ inc_dirs = os.getenv('CPATH', '').split(os.pathsep) + else: + lib_dirs = self.compiler.library_dirs[:] + inc_dirs = self.compiler.include_dirs[:] |