mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
a6757e4a52
This recipe had been moved out from python directory since 2016[1] in order to share patches between python2 and python3. But now there is no reason to keep it in its own directory as we only keep python3-nump. Move it back to python directory. [1] https://git.openembedded.org/openembedded-core/commit/?id=9bffe2f9fb4ce6c0b265f27e5b484fbe076c6349 (From OE-Core rev: e5702b8ebd16949c736b8c2f18bf35c0d64d80bd) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
73 lines
3.2 KiB
Diff
73 lines
3.2 KiB
Diff
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
|
|
|
|
avoid host contamination.
|
|
|
|
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, 6 insertions(+), 36 deletions(-)
|
|
|
|
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
|
index 82e864a..135246d 100644
|
|
--- a/numpy/distutils/system_info.py
|
|
+++ b/numpy/distutils/system_info.py
|
|
@@ -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',
|
|
- # path of umfpack under macports
|
|
- '/opt/local/include/ufsparse',
|
|
- '/opt/local/include', '/sw/include',
|
|
- '/usr/include/suitesparse']
|
|
- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src']
|
|
-
|
|
- 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']
|
|
-
|
|
- if os.path.exists('/usr/lib/X11'):
|
|
- globbed_x11_dir = glob('/usr/lib/*/libX11.so')
|
|
- if globbed_x11_dir:
|
|
- x11_so_dir = os.path.split(globbed_x11_dir[0])[0]
|
|
- default_x11_lib_dirs.extend([x11_so_dir, '/usr/lib/X11'])
|
|
- default_x11_include_dirs.extend(['/usr/lib/X11/include',
|
|
- '/usr/include/X11'])
|
|
-
|
|
- with open(os.devnull, 'w') as tmp:
|
|
- try:
|
|
- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE,
|
|
- stderr=tmp)
|
|
- except (OSError, DistutilsError):
|
|
- # OSError if gcc is not installed, or SandboxViolation (DistutilsError
|
|
- # subclass) if an old setuptools bug is triggered (see gh-3160).
|
|
- pass
|
|
- else:
|
|
- triplet = str(p.communicate()[0].decode().strip())
|
|
- if p.returncode == 0:
|
|
- # 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
|
|
|