code.ossystems Code Review - openembedded-core.git/blob

   1 From 27f6687e49bf555fc494d2f14bae6ecd0fa30f14 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   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
   5
   6  avoid host contamination.
   7
   8 Upstream-Status: Inappropriate (As the code stands, this is a hack)
   9 Signed-off-by: Ross Burton <ross.burton@intel.com>
  10 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  11
  12 ---
  13  numpy/distutils/system_info.py | 42 ++++------------------------------
  14  1 file changed, 5 insertions(+), 37 deletions(-)
  15
  16 diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
  17 index 3a6a7b2..6c2c3da 100644
  18 --- a/numpy/distutils/system_info.py
  19 +++ b/numpy/distutils/system_info.py
  20 @@ -309,45 +309,13 @@ if sys.platform == 'win32':
  21          add_system_root(os.path.join(conda_dir, 'Library'))
  22
  23  else:
  24 -    default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib',
  25 -                                 '/opt/local/lib', '/sw/lib'], platform_bits)
  26      default_runtime_dirs = []
  27 -    default_include_dirs = ['/usr/local/include',
  28 -                            '/opt/include', '/usr/include',
  29 -                            # path of umfpack under macports
  30 -                            '/opt/local/include/ufsparse',
  31 -                            '/opt/local/include', '/sw/include',
  32 -                            '/usr/include/suitesparse']
  33 -    default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src']
  34 -
  35 -    default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib',
  36 -                                     '/usr/lib'], platform_bits)
  37 -    default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include',
  38 -                                '/usr/include']
  39 -
  40 -    if os.path.exists('/usr/lib/X11'):
  41 -        globbed_x11_dir = glob('/usr/lib/*/libX11.so')
  42 -        if globbed_x11_dir:
  43 -            x11_so_dir = os.path.split(globbed_x11_dir[0])[0]
  44 -            default_x11_lib_dirs.extend([x11_so_dir, '/usr/lib/X11'])
  45 -            default_x11_include_dirs.extend(['/usr/lib/X11/include',
  46 -                                             '/usr/include/X11'])
  47 -
  48 -    with open(os.devnull, 'w') as tmp:
  49 -        try:
  50 -            p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE,
  51 -                         stderr=tmp)
  52 -        except (OSError, DistutilsError):
  53 -            # OSError if gcc is not installed, or SandboxViolation (DistutilsError
  54 -            # subclass) if an old setuptools bug is triggered (see gh-3160).
  55 -            pass
  56 -        else:
  57 -            triplet = str(p.communicate()[0].decode().strip())
  58 -            if p.returncode == 0:
  59 -                # gcc supports the "-print-multiarch" option
  60 -                default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
  61 -                default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
  62 +    default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
  63 +    default_include_dirs = ['/deaddir/include']
  64 +    default_src_dirs = ['.', '/deaddir/src']
  65
  66 +    default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
  67 +    default_x11_include_dirs = ['/deaddir/include']
  68
  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'))
  71 --
  72 2.17.1
  73