summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python-imaging
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/python/python-imaging')
-rw-r--r--meta/recipes-devtools/python/python-imaging/path.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-imaging/path.patch b/meta/recipes-devtools/python/python-imaging/path.patch
new file mode 100644
index 0000000000..264dcc09b8
--- /dev/null
+++ b/meta/recipes-devtools/python/python-imaging/path.patch
@@ -0,0 +1,33 @@
1Index: Imaging-1.1.7/setup.py
2===================================================================
3--- Imaging-1.1.7.orig/setup.py
4+++ Imaging-1.1.7/setup.py
5@@ -34,10 +34,10 @@ def libinclude(root):
6 # TIFF_ROOT = libinclude("/opt/tiff")
7
8 TCL_ROOT = None
9-JPEG_ROOT = None
10-ZLIB_ROOT = None
11+JPEG_ROOT = os.environ['STAGING_LIBDIR']
12+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
13 TIFF_ROOT = None
14-FREETYPE_ROOT = None
15+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
16 LCMS_ROOT = None
17
18 # FIXME: add mechanism to explicitly *disable* the use of a library
19@@ -207,14 +207,6 @@ class pil_build_ext(build_ext):
20 if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
21 add_directory(include_dirs, tcl_dir)
22
23- # standard locations
24- add_directory(library_dirs, "/usr/local/lib")
25- add_directory(include_dirs, "/usr/local/include")
26-
27- add_directory(library_dirs, "/usr/lib")
28- add_directory(include_dirs, "/usr/include")
29-
30- #
31 # insert new dirs *before* default libs, to avoid conflicts
32 # between Python PYD stub libs and real libraries
33