python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-09-21 11:28:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132 from cyisfor/master

Browse Source 
Linux platform.processor() returns valid crazy string sometimes
This commit is contained in:
Alex Clark ☺ 2013-03-15 05:00:02 -07:00
commit 541d73895d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
setup.py
View File

@ -76,7 +76,7 @@ PIL_VERSION = '1.1.7'
TCL_ROOT = None TCL_ROOT = None
JPEG_ROOT = None JPEG_ROOT = None
ZLIB_ROOT = None ZLIB_ROOT = None
TIFF_ROOT = None TIFF_ROOT = None
FREETYPE_ROOT = None FREETYPE_ROOT = None
LCMS_ROOT = None LCMS_ROOT = None
@ -127,16 +127,17 @@ class pil_build_ext(build_ext):
_add_directory(include_dirs, "/usr/X11/include") _add_directory(include_dirs, "/usr/X11/include")
elif sys.platform.startswith("linux"): elif sys.platform.startswith("linux"):
platform_ = platform.processor() for platform_ in (platform.processor(),platform.architecture()[0]):
if not platform_: if not platform_: continue
platform_ = platform.architecture()[0]
if platform_ in ["x86_64", "64bit"]:
if platform_ in ["x86_64", "64bit"]: _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") break
elif platform_ in ["i386", "i686", "32bit"]: elif platform_ in ["i386", "i686", "32bit"]:
_add_directory(library_dirs, "/usr/lib/i386-linux-gnu") _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
break
else: else:
raise ValueError("Unable to identify Linux platform: `%s`" % platform_) raise ValueError("Unable to identify Linux platform: `%s`" % platform_)
@ -156,7 +157,7 @@ class pil_build_ext(build_ext):
# #
# locate tkinter libraries # locate tkinter libraries
if _tkinter: if _tkinter:
TCL_VERSION = _tkinter.TCL_VERSION[:3] TCL_VERSION = _tkinter.TCL_VERSION[:3]
@ -184,7 +185,7 @@ class pil_build_ext(build_ext):
break break
else: else:
TCL_ROOT = None TCL_ROOT = None
# #
# add standard directories # add standard directories