summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch')
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch24
1 files changed, 10 insertions, 14 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
index 5b134edf07..ffd6ced136 100644
--- a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
+++ b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
@@ -11,11 +11,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11 numpy/distutils/system_info.py | 50 +++++------------------------------------- 11 numpy/distutils/system_info.py | 50 +++++-------------------------------------
12 1 file changed, 6 insertions(+), 44 deletions(-) 12 1 file changed, 6 insertions(+), 44 deletions(-)
13 13
14diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py 14Index: numpy-1.13.1/numpy/distutils/system_info.py
15index 9dd48e2..80e197a 100644 15===================================================================
16--- a/numpy/distutils/system_info.py 16--- numpy-1.13.1.orig/numpy/distutils/system_info.py
17+++ b/numpy/distutils/system_info.py 17+++ numpy-1.13.1/numpy/distutils/system_info.py
18@@ -204,51 +204,13 @@ if sys.platform == 'win32': 18@@ -211,51 +211,13 @@ if sys.platform == 'win32':
19 default_x11_lib_dirs = [] 19 default_x11_lib_dirs = []
20 default_x11_include_dirs = [] 20 default_x11_include_dirs = []
21 else: 21 else:
@@ -29,7 +29,10 @@ index 9dd48e2..80e197a 100644
29- '/opt/local/include', '/sw/include', 29- '/opt/local/include', '/sw/include',
30- '/usr/include/suitesparse'] 30- '/usr/include/suitesparse']
31- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src'] 31- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src']
32- 32+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
33+ default_include_dirs = ['/deaddir/include']
34+ default_src_dirs = ['.', '/deaddir/src']
35
33- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', 36- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib',
34- '/usr/lib'], platform_bits) 37- '/usr/lib'], platform_bits)
35- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', 38- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include',
@@ -50,7 +53,7 @@ index 9dd48e2..80e197a 100644
50- # tests are run in debug mode Python 3. 53- # tests are run in debug mode Python 3.
51- tmp = open(os.devnull, 'w') 54- tmp = open(os.devnull, 'w')
52- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE, 55- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE,
53- stderr=tmp) 56- stderr=tmp)
54- except (OSError, DistutilsError): 57- except (OSError, DistutilsError):
55- # OSError if gcc is not installed, or SandboxViolation (DistutilsError 58- # OSError if gcc is not installed, or SandboxViolation (DistutilsError
56- # subclass) if an old setuptools bug is triggered (see gh-3160). 59- # subclass) if an old setuptools bug is triggered (see gh-3160).
@@ -64,15 +67,8 @@ index 9dd48e2..80e197a 100644
64- finally: 67- finally:
65- if tmp is not None: 68- if tmp is not None:
66- tmp.close() 69- tmp.close()
67+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
68+ default_include_dirs = ['/deaddir/include']
69+ default_src_dirs = ['.', '/deaddir/src']
70+
71+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) 70+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
72+ default_x11_include_dirs = ['/deaddir/include'] 71+ default_x11_include_dirs = ['/deaddir/include']
73 72
74 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: 73 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
75 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) 74 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
76--
772.6.2
78