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 | 11 |
1 files changed, 7 insertions, 4 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 98a9705831..cdb6a473d2 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,4 +1,4 @@ | |||
1 | From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 | 1 | From 27f6687e49bf555fc494d2f14bae6ecd0fa30f14 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] 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 |
@@ -14,11 +14,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 1 file changed, 5 insertions(+), 37 deletions(-) | 14 | 1 file changed, 5 insertions(+), 37 deletions(-) |
15 | 15 | ||
16 | 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 |
17 | index ba2b1f4..f94dce1 100644 | 17 | index 3a6a7b2..6c2c3da 100644 |
18 | --- a/numpy/distutils/system_info.py | 18 | --- a/numpy/distutils/system_info.py |
19 | +++ b/numpy/distutils/system_info.py | 19 | +++ b/numpy/distutils/system_info.py |
20 | @@ -278,45 +278,13 @@ if sys.platform == 'win32': | 20 | @@ -309,45 +309,13 @@ if sys.platform == 'win32': |
21 | add_system_root(os.path.join(conda_dir, 'Library')) | 21 | add_system_root(os.path.join(conda_dir, 'Library')) |
22 | 22 | ||
23 | else: | 23 | else: |
24 | - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', | 24 | - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', |
@@ -68,3 +68,6 @@ index ba2b1f4..f94dce1 100644 | |||
68 | 68 | ||
69 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: | 69 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: |
70 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) | 70 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) |
71 | -- | ||
72 | 2.17.1 | ||
73 | |||