summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-02-20 18:53:59 +0000
committerMike Frysinger <vapier@gentoo.org>2015-02-20 18:53:59 +0000
commit8f459a90a1aee55a223a063d6591466ed484561e (patch)
tree7bd5f558d23848cec7ce43ea849a3589538c80f9 /dev-python/imaging/files
parentTransform lohit-fonts into a meta ebuild to pull in all individual lohit font... (diff)
downloadhistorical-8f459a90a1aee55a223a063d6591466ed484561e.tar.gz
historical-8f459a90a1aee55a223a063d6591466ed484561e.tar.bz2
historical-8f459a90a1aee55a223a063d6591466ed484561e.zip
Fix from Chromium OS for cross-compiling.
Package-Manager: portage-2.2.17/cvs/Linux x86_64 Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'dev-python/imaging/files')
-rw-r--r--dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch b/dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch
new file mode 100644
index 000000000000..a84c032450cf
--- /dev/null
+++ b/dev-python/imaging/files/imaging-1.1.7-no-host-paths.patch
@@ -0,0 +1,29 @@
+do not poke around /usr/include and /usr/lib directly as it's (1) not needed
+and (2) breaks cross-compiling
+
+patch from Chromium OS
+
+--- a/setup.py
++++ b/setup.py
+@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
+ add_directory(library_dirs, "/opt/local/lib")
+ add_directory(include_dirs, "/opt/local/include")
+
+- add_directory(library_dirs, "/usr/local/lib")
+ # FIXME: check /opt/stuff directories here?
+
+ prefix = sysconfig.get_config_var("prefix")
+@@ -207,13 +206,6 @@ class pil_build_ext(build_ext):
+ if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
+ add_directory(include_dirs, tcl_dir)
+
+- # standard locations
+- add_directory(library_dirs, "/usr/local/lib")
+- add_directory(include_dirs, "/usr/local/include")
+-
+- add_directory(library_dirs, "/usr/lib")
+- add_directory(include_dirs, "/usr/include")
+-
+ #
+ # insert new dirs *before* default libs, to avoid conflicts
+ # between Python PYD stub libs and real libraries