python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-12 10:16:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Kludge fix for multiarch support

Browse Source
This commit is contained in:
Alex Clark 2011-05-31 11:24:38 -04:00
parent 3865a5d04e
commit fd1a64dccd
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
setup.py
View File

@ -121,6 +121,13 @@ class pil_build_ext(build_ext):
_add_directory(library_dirs, "/lib64") _add_directory(library_dirs, "/lib64")
_add_directory(library_dirs, "/usr/lib64") _add_directory(library_dirs, "/usr/lib64")
_add_directory(library_dirs, "/usr/lib/x86_64-linux-gnu") _add_directory(library_dirs, "/usr/lib/x86_64-linux-gnu")
else:
_add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
# XXX Kludge. Above /\ we brute force support multiarch. Here we
# try Barry's more general approach. Afterward, something should
# work ;-)
self.add_multiarch_paths()
_add_directory(library_dirs, "/usr/local/lib") _add_directory(library_dirs, "/usr/local/lib")
# FIXME: check /opt/stuff directories here? # FIXME: check /opt/stuff directories here?
@ -419,6 +426,23 @@ class pil_build_ext(build_ext):
if m.group(1) < "1.2.3": if m.group(1) < "1.2.3":
return m.group(1) return m.group(1)
# http://hg.python.org/users/barry/rev/7e8deab93d5a
def add_multiarch_paths(self):
# Debian/Ubuntu multiarch support.
# https://wiki.ubuntu.com/MultiarchSpec
# self.build_temp
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' %
tmpfile)
ret = os.system(
'dpkg-architecture -qDEB_HOST_MULTIARCH > %s 2> /dev/null' %
tmpfile)
try:
if ret >> 8 == 0:
with open(tmpfile) as fp:
setup( setup(
name=NAME, name=NAME,
version=VERSION, version=VERSION,