diff options
Diffstat (limited to 'meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch b/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch deleted file mode 100644 index 2575306bec..0000000000 --- a/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch +++ /dev/null | |||
@@ -1,55 +0,0 @@ | |||
1 | From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 15 Nov 2011 13:16:54 +0100 | ||
4 | Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | |||
8 | Upstream-Status: Inappropriate [embedded specific] | ||
9 | --- | ||
10 | setup.py | 14 +++----------- | ||
11 | 1 files changed, 3 insertions(+), 11 deletions(-) | ||
12 | |||
13 | diff --git a/setup.py b/setup.py | ||
14 | index 5d4d53a..b1a22ec 100644 | ||
15 | --- a/setup.py | ||
16 | +++ b/setup.py | ||
17 | @@ -34,10 +34,10 @@ def libinclude(root): | ||
18 | # TIFF_ROOT = libinclude("/opt/tiff") | ||
19 | |||
20 | TCL_ROOT = None | ||
21 | -JPEG_ROOT = None | ||
22 | -ZLIB_ROOT = None | ||
23 | +JPEG_ROOT = os.environ['STAGING_LIBDIR'] | ||
24 | +ZLIB_ROOT = os.environ['STAGING_LIBDIR'] | ||
25 | TIFF_ROOT = None | ||
26 | -FREETYPE_ROOT = None | ||
27 | +FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] | ||
28 | LCMS_ROOT = None | ||
29 | |||
30 | # FIXME: add mechanism to explicitly *disable* the use of a library | ||
31 | @@ -147,7 +147,6 @@ class pil_build_ext(build_ext): | ||
32 | add_directory(library_dirs, "/opt/local/lib") | ||
33 | add_directory(include_dirs, "/opt/local/include") | ||
34 | |||
35 | - add_directory(library_dirs, "/usr/local/lib") | ||
36 | # FIXME: check /opt/stuff directories here? | ||
37 | |||
38 | prefix = sysconfig.get_config_var("prefix") | ||
39 | @@ -207,13 +206,6 @@ class pil_build_ext(build_ext): | ||
40 | if os.path.isfile(os.path.join(tcl_dir, "tk.h")): | ||
41 | add_directory(include_dirs, tcl_dir) | ||
42 | |||
43 | - # standard locations | ||
44 | - add_directory(library_dirs, "/usr/local/lib") | ||
45 | - add_directory(include_dirs, "/usr/local/include") | ||
46 | - | ||
47 | - add_directory(library_dirs, "/usr/lib") | ||
48 | - add_directory(include_dirs, "/usr/include") | ||
49 | - | ||
50 | # | ||
51 | # insert new dirs *before* default libs, to avoid conflicts | ||
52 | # between Python PYD stub libs and real libraries | ||
53 | -- | ||
54 | 1.7.2.5 | ||
55 | |||