- Issue #11715: Fix multiarch detection without having Debian development
tools (dpkg-dev) installed.
This commit is contained in:
parent
f8a9a837c4
commit
98b1c446d5
|
@ -541,6 +541,9 @@ Tests
|
|||
Build
|
||||
-----
|
||||
|
||||
- Issue #11715: Fix multiarch detection without having Debian development
|
||||
tools (dpkg-dev) installed.
|
||||
|
||||
- Issue #15819: Make sure we can build Python out-of-tree from a readonly
|
||||
source directory. (Somewhat related to Issue #9860.)
|
||||
|
||||
|
|
21
setup.py
21
setup.py
|
@ -376,6 +376,27 @@ class PyBuildExt(build_ext):
|
|||
def add_multiarch_paths(self):
|
||||
# Debian/Ubuntu multiarch support.
|
||||
# https://wiki.ubuntu.com/MultiarchSpec
|
||||
cc = sysconfig.get_config_var('CC')
|
||||
tmpfile = os.path.join(self.build_temp, 'multiarch')
|
||||
if not os.path.exists(self.build_temp):
|
||||
os.makedirs(self.build_temp)
|
||||
ret = os.system(
|
||||
'%s -print-multiarch > %s 2> /dev/null' % (cc, tmpfile))
|
||||
multiarch_path_component = ''
|
||||
try:
|
||||
if ret >> 8 == 0:
|
||||
with open(tmpfile) as fp:
|
||||
multiarch_path_component = fp.readline().strip()
|
||||
finally:
|
||||
os.unlink(tmpfile)
|
||||
|
||||
if multiarch_path_component != '':
|
||||
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)
|
||||
return
|
||||
|
||||
if not find_executable('dpkg-architecture'):
|
||||
return
|
||||
tmpfile = os.path.join(self.build_temp, 'multiarch')
|
||||
|
|
Loading…
Reference in New Issue