From 4d10f010f4cf2049c43583afbd5fd85ac6df91a8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 3 Apr 2008 05:18:13 +0000 Subject: python-imaging: added from OE (required for flumotion update) git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4162 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/python/python-imaging/path.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 meta-extras/packages/python/python-imaging/path.patch (limited to 'meta-extras/packages/python/python-imaging') diff --git a/meta-extras/packages/python/python-imaging/path.patch b/meta-extras/packages/python/python-imaging/path.patch new file mode 100644 index 000000000..1dc467a56 --- /dev/null +++ b/meta-extras/packages/python/python-imaging/path.patch @@ -0,0 +1,37 @@ +Index: Imaging-1.1.5/setup.py +=================================================================== +--- Imaging-1.1.5.orig/setup.py 2005-03-23 19:16:40.000000000 +0100 ++++ Imaging-1.1.5/setup.py 2006-05-31 14:36:07.000000000 +0200 +@@ -28,12 +28,13 @@ + # + # TIFF_ROOT = libinclude("/opt/tiff") + +-FREETYPE_ROOT = None +-JPEG_ROOT = None ++FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] ++JPEG_ROOT = os.environ['STAGING_LIBDIR'] + TIFF_ROOT = None +-ZLIB_ROOT = None ++ZLIB_ROOT = os.environ['STAGING_LIBDIR'] + TCL_ROOT = None + ++ + # FIXME: add mechanism to explicitly *disable* the use of a library + + # -------------------------------------------------------------------- +@@ -175,15 +176,6 @@ + add_directory(include_dirs, include_root) + + # +- # add standard directories +- +- 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 + -- cgit v1.2.3