From: Barry Warsaw Date: Thu, 7 Apr 2011 15:28:11 +0000 (-0400) Subject: Backport for Python 2.7 of issue 11715 support for building Python on X-Git-Tag: v2.7.2rc1~181 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ffc9caf9fefe511b1469d1f6de64ddc420a2b949;p=python Backport for Python 2.7 of issue 11715 support for building Python on multiarch Debian/Ubuntu. --- diff --git a/setup.py b/setup.py index 38f21d8c66..6b47451bed 100644 --- a/setup.py +++ b/setup.py @@ -345,10 +345,33 @@ class PyBuildExt(build_ext): 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.