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 | 24 |
1 files changed, 13 insertions, 11 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..9f5f25f9b5 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 @@ -From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 +From 27f6687e49bf555fc494d2f14bae6ecd0fa30f14 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 10 Dec 2015 13:20:30 +0200 Subject: [PATCH] Don't search /usr and so on for libraries by default to @@ -8,24 +8,23 @@ Subject: [PATCH] Don't search /usr and so on for libraries by default to Upstream-Status: Inappropriate (As the code stands, this is a hack) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- - numpy/distutils/system_info.py | 42 ++++------------------------------ - 1 file changed, 5 insertions(+), 37 deletions(-) + numpy/distutils/system_info.py | 42 +++++----------------------------- + 1 file changed, 6 insertions(+), 36 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index ba2b1f4..f94dce1 100644 +index 82e864a..135246d 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -278,45 +278,13 @@ if sys.platform == 'win32': - add_system_root(os.path.join(conda_dir, 'Library')) +@@ -323,44 +323,14 @@ if sys.platform == 'win32': + add_system_root(os.path.join(conda_dir, 'Library')) else: - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', - '/opt/local/lib', '/sw/lib'], platform_bits) default_runtime_dirs = [] - default_include_dirs = ['/usr/local/include', -- '/opt/include', '/usr/include', +- '/opt/include', - # path of umfpack under macports - '/opt/local/include/ufsparse', - '/opt/local/include', '/sw/include', @@ -34,8 +33,7 @@ index ba2b1f4..f94dce1 100644 - - default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', - '/usr/lib'], platform_bits) -- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', -- '/usr/include'] +- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include'] - - if os.path.exists('/usr/lib/X11'): - globbed_x11_dir = glob('/usr/lib/*/libX11.so') @@ -59,12 +57,16 @@ index ba2b1f4..f94dce1 100644 - # gcc supports the "-print-multiarch" option - default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] - default_lib_dirs += [os.path.join("/usr/lib/", triplet)] + + default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) + default_include_dirs = ['/deaddir/include'] + default_src_dirs = ['.', '/deaddir/src'] - ++ + default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) + default_x11_include_dirs = ['/deaddir/include'] if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) +-- +2.25.1 + |