mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-05 16:28:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

python-imaging: bring in fixes from meta-oe

Browse Source 
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>
This commit is contained in:
Paul Eggleton
2012-03-15 13:17:58 +00:00
committed by Richard Purdie
parent 24d1560609
commit be0f9dd483
3 changed files with 61 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
meta/recipes-devtools/python/python-imaging/0001-python-imaging-setup.py-force-paths-for-zlib-freetyp.patch Normal file
View File

@@ -0,0 +1,55 @@
From 07d4f095a9e22ae676a8d68073101131e65012dc Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 15 Nov 2011 13:16:54 +0100
Subject: [PATCH] python imaging setup.py: force paths for zlib, freetype and jpeg and don't add host paths
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Upstream-Status: Inappropriate [embedded specific]
---
setup.py | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/setup.py b/setup.py
index 5d4d53a..b1a22ec 100644
--- a/setup.py
+++ b/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
@@ -147,7 +147,6 @@ class pil_build_ext(build_ext):
add_directory(library_dirs, "/opt/local/lib")
add_directory(include_dirs, "/opt/local/include")
- add_directory(library_dirs, "/usr/local/lib")
# FIXME: check /opt/stuff directories here?
prefix = sysconfig.get_config_var("prefix")
@@ -207,13 +206,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
--
1.7.2.5

35
meta/recipes-devtools/python/python-imaging/path.patch
View File

@@ -1,35 +0,0 @@
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