diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-08-25 20:33:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-08-25 20:33:55 +0000 |
| commit | 16e6877c4ce53fd3be88dd77263a03e7d88c3163 (patch) | |
| tree | 831004ca391e04c8deaace28b15cb602c0848c77 /meta/packages/python/python-imaging/path.patch | |
| parent | 07eeb6a8b6d671db7566f839ab22a26b6f118077 (diff) | |
| download | openembedded-core-16e6877c4ce53fd3be88dd77263a03e7d88c3163.tar.gz openembedded-core-16e6877c4ce53fd3be88dd77263a03e7d88c3163.tar.bz2 openembedded-core-16e6877c4ce53fd3be88dd77263a03e7d88c3163.tar.xz openembedded-core-16e6877c4ce53fd3be88dd77263a03e7d88c3163.zip | |
python: Promote from meta-extras to meta
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5092 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/python/python-imaging/path.patch')
| -rw-r--r-- | meta/packages/python/python-imaging/path.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/packages/python/python-imaging/path.patch b/meta/packages/python/python-imaging/path.patch new file mode 100644 index 000000000..1dc467a56 --- /dev/null +++ b/meta/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 + |