(original) (raw)

changeset: 69175:867937dd2279 branch: 3.2 parent: 69171:b807cf929e26 parent: 69174:7582a78f573b user: Barry Warsaw barry@python.org date: Wed Apr 06 15:19:05 2011 -0400 files: setup.py description: Issue 11715: Merge multiarch fix from 3.1 branch. diff -r b807cf929e26 -r 867937dd2279 setup.py --- a/setup.py Wed Apr 06 08:13:02 2011 -0400 +++ b/setup.py Wed Apr 06 15:19:05 2011 -0400 @@ -370,12 +370,33 @@ return platform return sys.platform + def add_multiarch_paths(self): + # Debian/Ubuntu multiarch support. + # https://wiki.ubuntu.com/MultiarchSpec + 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, but the local build # directories (i.e. '.' and 'Include') must be first. See issue # 10520. 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. /barry@python.org