From c44994b78ca6c0d31cf7d4b3a835688440829538 Mon Sep 17 00:00:00 2001 From: Anton Vlasenko Date: Mon, 18 Feb 2013 18:16:13 +0200 Subject: [PATCH] Fixing #41 issue with Py3k libs path --- setup.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 239b4676c..10ef36697 100644 --- a/setup.py +++ b/setup.py @@ -127,12 +127,18 @@ class pil_build_ext(build_ext): _add_directory(include_dirs, "/usr/X11/include") elif sys.platform.startswith("linux"): - if platform.processor() == "x86_64": + platform_ = platform.processor() + if not platform_: + platform_ = platform.architecture()[0] + + if platform_ in ["x86_64", "64bit"]: _add_directory(library_dirs, "/lib64") _add_directory(library_dirs, "/usr/lib64") _add_directory(library_dirs, "/usr/lib/x86_64-linux-gnu") - else: + elif platform_ in ["i386", "i686", "32bit"]: _add_directory(library_dirs, "/usr/lib/i386-linux-gnu") + else: + raise ValueError("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