diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-03-15 13:17:58 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-16 10:57:09 +0000 |
commit | be0f9dd483af2a2f55b2ae8ef9ca172e7c90819c (patch) | |
tree | ace680fa870f648d397575f48e693e3530ccc6ce /meta/recipes-devtools/python/python-imaging/path.patch | |
parent | 24d15606096b79bdf9961f99b6857ae138fa3da1 (diff) | |
download | poky-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/path.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-imaging/path.patch | 35 |
1 files changed, 0 insertions, 35 deletions
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 @@ | |||
1 | Upstream-Status: Inappropriate [embedded specific] | ||
2 | |||
3 | Index: 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 | |||