all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Marius Bakke <mbakke@fastmail.com>
To: 32953@debbugs.gnu.org
Subject: [bug#32953] [PATCH core-updates-next 6/8] gnu: python: Fix FTBFS with GCC >= 6.
Date: Sat,  6 Oct 2018 15:16:37 +0200	[thread overview]
Message-ID: <20181006131639.8424-6-mbakke@fastmail.com> (raw)
In-Reply-To: <20181006131639.8424-1-mbakke@fastmail.com>

* 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

  parent reply	other threads:[~2018-10-06 13:17 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-06 13:14 [bug#32953] [PATCH core-updates-next 0/8] Use GCC7 as the default compiler Marius Bakke
2018-10-06 13:16 ` [bug#32953] [PATCH core-updates-next 1/8] gnu: Remove gcc-for-libstdc++ Marius Bakke
2018-10-06 13:16   ` [bug#32953] [PATCH core-updates-next 2/8] gnu: libstdc++-boot0: Improve gcc-wrapper workaround Marius Bakke
2018-10-11  8:08     ` Danny Milosavljevic
2018-10-06 13:16   ` [bug#32953] [PATCH core-updates-next 3/8] gnu: gcc-boot0: Improve gcc-wrapper workarounds Marius Bakke
2018-10-11  8:08     ` Danny Milosavljevic
2018-10-06 13:16   ` [bug#32953] [PATCH core-updates-next 4/8] gnu: Remove duplicate linux-libre-headers package from bootstrap inputs Marius Bakke
2018-10-11  8:09     ` Danny Milosavljevic
2018-10-06 13:16   ` [bug#32953] [PATCH core-updates-next 5/8] gnu: Use GCC 7 as the default compiler Marius Bakke
2018-10-11  8:05     ` Danny Milosavljevic
2018-10-06 13:16   ` Marius Bakke [this message]
2018-10-06 13:16   ` [bug#32953] [PATCH core-updates-next 7/8] gnu: cmake: Try CPATH and C_INCLUDE_PATH when finding system libraries Marius Bakke
2018-10-11  8:06     ` Danny Milosavljevic
2018-10-06 13:16   ` [bug#32953] [PATCH core-updates-next 8/8] gnu: cppunit: Update to 1.14.0 Marius Bakke
2018-10-11  8:17     ` Danny Milosavljevic
2018-10-06 17:00 ` [bug#32953] [PATCH core-updates-next 0/8] Use GCC7 as the default compiler Marius Bakke
2018-12-27 10:59   ` Ludovic Courtès
2018-12-29 17:58     ` Efraim Flashner
2019-01-16 13:53       ` Marius Bakke
2019-01-19 17:09         ` Efraim Flashner
2019-01-19 20:01           ` Efraim Flashner
2019-02-06 20:23             ` Marius Bakke
2019-02-06 22:35               ` Ricardo Wurmus
2019-02-06 23:03                 ` Marius Bakke
2019-02-08 12:28                   ` Ricardo Wurmus
2019-02-09 15:00               ` Ludovic Courtès
2019-02-09 20:57                 ` bug#32953: " Marius Bakke

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181006131639.8424-6-mbakke@fastmail.com \
    --to=mbakke@fastmail.com \
    --cc=32953@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.