01/01: gnu: python: Honor 'C_INCLUDE_PATH'.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit a2ab82db9ab5d6db86762924d3016aed7c26c315
Author: Ludovic Courtès <address@hidden>
Date:   Tue Jan 5 12:35:30 2016 +0100

    gnu: python: Honor 'C_INCLUDE_PATH'.
    
    This is a followup to 009b53fd.
    
    * gnu/packages/patches/python-3-search-paths.patch: Check
    'C_INCLUDE_PATH' instead of 'CPATH'.
    * gnu/packages/patches/python-2.7-search-paths.patch: Likewise.
---
 gnu/packages/patches/python-2.7-search-paths.patch |    6 +++---
 gnu/packages/patches/python-3-search-paths.patch   |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/patches/python-2.7-search-paths.patch 
b/gnu/packages/patches/python-2.7-search-paths.patch
index 6e5339f..ba7235d 100644
--- a/gnu/packages/patches/python-2.7-search-paths.patch
+++ b/gnu/packages/patches/python-2.7-search-paths.patch
@@ -1,5 +1,5 @@
-Make sure the build system honors CPATH and LIBRARY_PATH when looking for
-headers and libraries.
+Make sure the build system honors C_INCLUDE_PATH 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
@@ -9,7 +9,7 @@ headers and libraries.
  
 +        # Always honor these variables.
 +        lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-+        inc_dirs += os.getenv('CPATH', '').split(os.pathsep)
++        inc_dirs += os.getenv('C_INCLUDE_PATH', '').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 547feae..7feddb8 100644
--- a/gnu/packages/patches/python-3-search-paths.patch
+++ b/gnu/packages/patches/python-3-search-paths.patch
@@ -1,5 +1,5 @@
-Make sure the build system honors CPATH and LIBRARY_PATH when looking for
-headers and libraries.
+Make sure the build system honors C_INCLUDE_PATH 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
@@ -13,7 +13,7 @@ headers and libraries.
 -                ]
 -            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)
++            inc_dirs = os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
          else:
              lib_dirs = self.compiler.library_dirs[:]
              inc_dirs = self.compiler.include_dirs[:]