diff options
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-.patch | 16 |
1 files changed, 7 insertions, 9 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 516ccd7b9b..8fe0d1a27e 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 | |||
@@ -1,7 +1,8 @@ | |||
1 | From c8c6649b29a08f82e1d6761a6d62ce5f632313c5 Mon Sep 17 00:00:00 2001 | 1 | From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 10 Dec 2015 13:20:30 +0200 | 3 | Date: Thu, 10 Dec 2015 13:20:30 +0200 |
4 | Subject: [PATCH 1/3] Don't search /usr and so on for libraries by default to | 4 | Subject: [PATCH] Don't search /usr and so on for libraries by default to |
5 | |||
5 | avoid host contamination. | 6 | avoid host contamination. |
6 | 7 | ||
7 | Upstream-Status: Inappropriate (As the code stands, this is a hack) | 8 | Upstream-Status: Inappropriate (As the code stands, this is a hack) |
@@ -9,16 +10,16 @@ Signed-off-by: Ross Burton <ross.burton@intel.com> | |||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | 11 | ||
11 | --- | 12 | --- |
12 | numpy/distutils/system_info.py | 50 +++++------------------------------------- | 13 | numpy/distutils/system_info.py | 50 ++++------------------------------ |
13 | 1 file changed, 6 insertions(+), 44 deletions(-) | 14 | 1 file changed, 6 insertions(+), 44 deletions(-) |
14 | 15 | ||
15 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py | 16 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
16 | index bea120c..544e056 100644 | 17 | index 2424943..bf56a6d 100644 |
17 | --- a/numpy/distutils/system_info.py | 18 | --- a/numpy/distutils/system_info.py |
18 | +++ b/numpy/distutils/system_info.py | 19 | +++ b/numpy/distutils/system_info.py |
19 | @@ -262,51 +262,13 @@ if sys.platform == 'win32': | 20 | @@ -274,51 +274,13 @@ if sys.platform == 'win32': |
20 | add_system_root(os.path.join(conda_dir, 'Library')) | 21 | add_system_root(os.path.join(conda_dir, 'Library')) |
21 | 22 | ||
22 | else: | 23 | else: |
23 | - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', | 24 | - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', |
24 | - '/opt/local/lib', '/sw/lib'], platform_bits) | 25 | - '/opt/local/lib', '/sw/lib'], platform_bits) |
@@ -74,6 +75,3 @@ index bea120c..544e056 100644 | |||
74 | 75 | ||
75 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: | 76 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: |
76 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) | 77 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) |
77 | -- | ||
78 | 2.16.1 | ||
79 | |||