From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g8mSB-0006K9-To for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g8mS8-00029c-Pu for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34140) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g8mS8-00029T-Iv for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g8mS8-0002ru-Ch for guix-patches@gnu.org; Sat, 06 Oct 2018 09:17:04 -0400 Subject: [bug#32953] [PATCH core-updates-next 6/8] gnu: python: Fix FTBFS with GCC >= 6. Resent-Message-ID: From: Marius Bakke Date: Sat, 6 Oct 2018 15:16:37 +0200 Message-Id: <20181006131639.8424-6-mbakke@fastmail.com> In-Reply-To: <20181006131639.8424-1-mbakke@fastmail.com> References: <20181006131639.8424-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32953@debbugs.gnu.org * 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 ba7235df2..a012bc8fe 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 73e3f4ccf..c82470563 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 -- 2.19.0