summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python-imaging/path.patch
blob: a5bba75ef62637b219ccd1a0e50149eb5ad18229 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
Upstream-Status: Inappropriate [embedded specific]

Index: Imaging-1.1.7/setup.py
===================================================================
--- Imaging-1.1.7.orig/setup.py
+++ Imaging-1.1.7/setup.py
@@ -34,10 +34,10 @@ def libinclude(root):
 # TIFF_ROOT = libinclude("/opt/tiff")
 
 TCL_ROOT = None
-JPEG_ROOT = None
-ZLIB_ROOT = None
+JPEG_ROOT = os.environ['STAGING_LIBDIR']
+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
 TIFF_ROOT = None
-FREETYPE_ROOT = None
+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
 LCMS_ROOT = None
 
 # FIXME: add mechanism to explicitly *disable* the use of a library
@@ -207,14 +207,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