unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 6457819b8a49edadc3464574262c38ab9eafad25 1010 bytes (raw)
name: gnu/packages/patches/python-2.7-search-paths.patch 	 # note: path name is non-authoritative(*)
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20

 
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
@@ -526,6 +526,14 @@ 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.
+        if not cross_compiling:
+            lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
+            inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
+        else:
+            lib_dirs = os.getenv('CROSS_LIBRARY_PATH', '').split(os.pathsep)
+            inc_dirs = os.getenv('CROSS_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']:
             lib_dirs += ['/usr/ccs/lib']

debug log:

solving 6457819b8a ...
found 6457819b8a in https://yhetil.org/guix-patches/20190708095913.3460-9-m.othacehe@gmail.com/
found ba7235df27 in https://git.savannah.gnu.org/cgit/guix.git
preparing index
index prepared:
100644 ba7235df277428c0f44f4e4bb67698c67af7de2d	gnu/packages/patches/python-2.7-search-paths.patch

applying [1/1] https://yhetil.org/guix-patches/20190708095913.3460-9-m.othacehe@gmail.com/
diff --git a/gnu/packages/patches/python-2.7-search-paths.patch b/gnu/packages/patches/python-2.7-search-paths.patch
index ba7235df27..6457819b8a 100644

Checking patch gnu/packages/patches/python-2.7-search-paths.patch...
Applied patch gnu/packages/patches/python-2.7-search-paths.patch cleanly.

index at:
100644 6457819b8a49edadc3464574262c38ab9eafad25	gnu/packages/patches/python-2.7-search-paths.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^
Code repositories for project(s) associated with this public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).