| From 672a75c8417ce08db9e31fc415ec445479231d5a 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, 5 insertions(+), 37 deletions(-) |
| |
| diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
| index ba2b1f4..f94dce1 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')) |
| |
| 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', |
| - # 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', |
| - '/usr/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')) |