mirror of
https://github.com/pyenv/pyenv.git
synced 2024-11-21 20:47:00 -05:00
45 lines
1.8 KiB
Diff
45 lines
1.8 KiB
Diff
|
--- setup.py.orig 2011-07-07 19:41:48.610196111 +0900
|
||
|
|
+++ setup.py 2011-07-07 19:46:44.986310031 +0900
|
||
|
|
@@ -14,6 +14,7 @@
|
||
|
|
from distutils.command.build_ext import build_ext
|
||
|
|
from distutils.command.install import install
|
||
|
|
from distutils.command.install_lib import install_lib
|
||
|
|
+from distutils.spawn import find_executable
|
||
|
|
|
||
|
|
# This global variable is used to hold the list of modules to be disabled.
|
||
|
|
disabled_module_list = []
|
||
|
|
@@ -308,10 +309,33 @@
|
||
|
|
return platform
|
||
|
|
return sys.platform
|
||
|
|
|
||
|
|
+ def add_multiarch_paths(self):
|
||
|
|
+ # Debian/Ubuntu multiarch support.
|
||
|
|
+ # https://wiki.ubuntu.com/MultiarchSpec
|
||
|
|
+ if not find_executable('dpkg-architecture'):
|
||
|
|
+ return
|
||
|
|
+ tmpfile = os.path.join(self.build_temp, 'multiarch')
|
||
|
|
+ if not os.path.exists(self.build_temp):
|
||
|
|
+ os.makedirs(self.build_temp)
|
||
|
|
+ ret = os.system(
|
||
|
|
+ 'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
|
||
|
|
+ tmpfile)
|
||
|
|
+ try:
|
||
|
|
+ if ret >> 8 == 0:
|
||
|
|
+ with open(tmpfile) as fp:
|
||
|
|
+ multiarch_path_component = fp.readline().strip()
|
||
|
|
+ add_dir_to_list(self.compiler.library_dirs,
|
||
|
|
+ '/usr/lib/' + multiarch_path_component)
|
||
|
|
+ add_dir_to_list(self.compiler.include_dirs,
|
||
|
|
+ '/usr/include/' + multiarch_path_component)
|
||
|
|
+ finally:
|
||
|
|
+ os.unlink(tmpfile)
|
||
|
|
+
|
||
|
|
def detect_modules(self):
|
||
|
|
# Ensure that /usr/local is always used
|
||
|
|
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
||
|
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
||
|
|
+ self.add_multiarch_paths()
|
||
|
|
|
||
|
|
# Add paths specified in the environment variables LDFLAGS and
|
||
|
|
# CPPFLAGS for header and library files.
|