summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python-imaging
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-03-15 13:17:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-16 10:57:09 +0000
commitbe0f9dd483af2a2f55b2ae8ef9ca172e7c90819c (patch)
treeace680fa870f648d397575f48e693e3530ccc6ce /meta/recipes-devtools/python/python-imaging
parent24d15606096b79bdf9961f99b6857ae138fa3da1 (diff)
downloadpoky-be0f9dd483af2a2f55b2ae8ef9ca172e7c90819c.tar.gz
python-imaging: bring in fixes from meta-oe
This makes the following changes: * Replace the /usr/local/bin/python path in all scripts * Move RDEPENDS_${PN} to the end (but use += or we lose the python-core depencency). * Use PR = "r3" instead of "ml2". (Even without increasing the numeric part it is recognised as greater alphabetically.) * Bring in meta-oe version of the path patch which avoids the following warning: WARNING: python-imaging: The compile log indicates that host include and/or library paths were used. (From OE-Core rev: 9950163c91412eb58c3475354cc7f87a7be33c2b) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python-imaging')
-rw-r--r--meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch55
-rw-r--r--meta/recipes-devtools/python/python-imaging/path.patch35
2 files changed, 55 insertions, 35 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
new file mode 100644
index 0000000000..2575306bec
--- /dev/null
+++ b/meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch
@@ -0,0 +1,55 @@
1From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Tue, 15 Nov 2011 13:16:54 +0100
4Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7
8Upstream-Status: Inappropriate [embedded specific]
9---
10 setup.py | 14 +++-----------
11 1 files changed, 3 insertions(+), 11 deletions(-)
12
13diff --git a/setup.py b/setup.py
14index 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--
541.7.2.5
55
diff --git a/meta/recipes-devtools/python/python-imaging/path.patch b/meta/recipes-devtools/python/python-imaging/path.patch
deleted file mode 100644
index a5bba75ef6..0000000000
--- a/meta/recipes-devtools/python/python-imaging/path.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Index: Imaging-1.1.7/setup.py
4===================================================================
5--- Imaging-1.1.7.orig/setup.py
6+++ Imaging-1.1.7/setup.py
7@@ -34,10 +34,10 @@ def libinclude(root):
8 # TIFF_ROOT = libinclude("/opt/tiff")
9
10 TCL_ROOT = None
11-JPEG_ROOT = None
12-ZLIB_ROOT = None
13+JPEG_ROOT = os.environ['STAGING_LIBDIR']
14+ZLIB_ROOT = os.environ['STAGING_LIBDIR']
15 TIFF_ROOT = None
16-FREETYPE_ROOT = None
17+FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR']
18 LCMS_ROOT = None
19
20 # FIXME: add mechanism to explicitly *disable* the use of a library
21@@ -207,14 +207,6 @@ class pil_build_ext(build_ext):
22 if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
23 add_directory(include_dirs, tcl_dir)
24
25- # standard locations
26- add_directory(library_dirs, "/usr/local/lib")
27- add_directory(include_dirs, "/usr/local/include")
28-
29- add_directory(library_dirs, "/usr/lib")
30- add_directory(include_dirs, "/usr/include")
31-
32- #
33 # insert new dirs *before* default libs, to avoid conflicts
34 # between Python PYD stub libs and real libraries
35