[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: gnu: python: Fix FTBFS with GCC >= 6.
From: |
guix-commits |
Subject: |
02/10: gnu: python: Fix FTBFS with GCC >= 6. |
Date: |
Wed, 16 Jan 2019 08:41:20 -0500 (EST) |
mbakke pushed a commit to branch wip-gcc7
in repository guix.
commit 14015c27b8c101aa39dbff0994f16a341fef4d5d
Author: Marius Bakke <address@hidden>
Date: Fri Oct 5 20:46:57 2018 +0200
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.
---
gnu/packages/patches/python-2.7-search-paths.patch | 4 ++--
gnu/packages/patches/python-3-search-paths.patch | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/patches/python-2.7-search-paths.patch
b/gnu/packages/patches/python-2.7-search-paths.patch
index ba7235d..a012bc8 100644
--- a/gnu/packages/patches/python-2.7-search-paths.patch
+++ b/gnu/packages/patches/python-2.7-search-paths.patch
@@ -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.
--- 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.
+ 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)
if host_platform in ['osf1', 'unixware7', 'openunix8']:
diff --git a/gnu/packages/patches/python-3-search-paths.patch
b/gnu/packages/patches/python-3-search-paths.patch
index 73e3f4c..c824705 100644
--- a/gnu/packages/patches/python-3-search-paths.patch
+++ b/gnu/packages/patches/python-3-search-paths.patch
@@ -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.
--- 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
- 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)
++ 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
- branch wip-gcc7 created (now 2e48ea5), guix-commits, 2019/01/16
- 03/10: gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries., guix-commits, 2019/01/16
- 04/10: gnu: cppunit: Update to 1.14.0., guix-commits, 2019/01/16
- 01/10: gnu: Use GCC 7 as the default compiler., guix-commits, 2019/01/16
- 02/10: gnu: python: Fix FTBFS with GCC >= 6.,
guix-commits <=
- 06/10: gnu: texlive-bin: Remove explicit C++11 flag., guix-commits, 2019/01/16
- 05/10: gnu: swig: Fix FTBFS with GCC >= 6., guix-commits, 2019/01/16
- 10/10: gnu: inkscape: Fix FTBFS with GCC >= 6., guix-commits, 2019/01/16
- 08/10: gnu: libevdev: Fix FTBFS with GCC7., guix-commits, 2019/01/16
- 09/10: gnu: hyperrogue: Fix FTBFS with GCC7., guix-commits, 2019/01/16
- 07/10: gnu: aspell: Fix FTBFS with GCC7., guix-commits, 2019/01/16