python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-06-05 13:43:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

promote self.add_multiarch_paths()

Browse Source
This commit is contained in:
Eric Soroos 2017-11-13 10:57:49 +00:00
parent 4757cd6b5a
commit 8d9282dd01
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup.py
View File

@ -312,7 +312,15 @@ class pil_build_ext(build_ext):
elif sys.platform.startswith("linux"): elif sys.platform.startswith("linux"):
arch_tp = (plat.processor(), plat.architecture()[0]) arch_tp = (plat.processor(), plat.architecture()[0])
if arch_tp == ("x86_64", "32bit"): # This should be correct on debian derivatives.
if plat.dist()[0].lower() in ('debian', 'ubuntu'):
# If this doesn't work, don't just silently patch
# downstream because it's going to break when people
# try to build pillow from source instead of
# installing from the system packages.
self.add_multiarch_paths()
elif arch_tp == ("x86_64", "32bit"):
# 32-bit build on 64-bit machine. # 32-bit build on 64-bit machine.
_add_directory(library_dirs, "/usr/lib/i386-linux-gnu") _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
else: else:
@ -363,11 +371,6 @@ class pil_build_ext(build_ext):
raise ValueError( raise ValueError(
"Unable to identify Linux platform: `%s`" % platform_) "Unable to identify Linux platform: `%s`" % platform_)
# XXX Kludge. Above /\ we brute force support multiarch. Here we
# try Barry's more general approach. Afterward, something should
# work ;-)
self.add_multiarch_paths()
# termux support for android. # termux support for android.
# system libraries (zlib) are installed in /system/lib # system libraries (zlib) are installed in /system/lib
# headers are at $PREFIX/include # headers are at $PREFIX/include