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 | |
parent | 07eeb6a8b6d671db7566f839ab22a26b6f118077 (diff) | |
download | poky-16e6877c4ce53fd3be88dd77263a03e7d88c3163.tar.gz |
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')
-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 0000000000..1dc467a56d --- /dev/null +++ b/meta/packages/python/python-imaging/path.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Index: Imaging-1.1.5/setup.py | ||
2 | =================================================================== | ||
3 | --- Imaging-1.1.5.orig/setup.py 2005-03-23 19:16:40.000000000 +0100 | ||
4 | +++ Imaging-1.1.5/setup.py 2006-05-31 14:36:07.000000000 +0200 | ||
5 | @@ -28,12 +28,13 @@ | ||
6 | # | ||
7 | # TIFF_ROOT = libinclude("/opt/tiff") | ||
8 | |||
9 | -FREETYPE_ROOT = None | ||
10 | -JPEG_ROOT = None | ||
11 | +FREETYPE_ROOT = os.environ['STAGING_LIBDIR'], os.environ['STAGING_INCDIR'] | ||
12 | +JPEG_ROOT = os.environ['STAGING_LIBDIR'] | ||
13 | TIFF_ROOT = None | ||
14 | -ZLIB_ROOT = None | ||
15 | +ZLIB_ROOT = os.environ['STAGING_LIBDIR'] | ||
16 | TCL_ROOT = None | ||
17 | |||
18 | + | ||
19 | # FIXME: add mechanism to explicitly *disable* the use of a library | ||
20 | |||
21 | # -------------------------------------------------------------------- | ||
22 | @@ -175,15 +176,6 @@ | ||
23 | add_directory(include_dirs, include_root) | ||
24 | |||
25 | # | ||
26 | - # add standard directories | ||
27 | - | ||
28 | - add_directory(library_dirs, "/usr/local/lib") | ||
29 | - add_directory(include_dirs, "/usr/local/include") | ||
30 | - | ||
31 | - add_directory(library_dirs, "/usr/lib") | ||
32 | - add_directory(include_dirs, "/usr/include") | ||
33 | - | ||
34 | - # | ||
35 | # insert new dirs *before* default libs, to avoid conflicts | ||
36 | # between Python PYD stub libs and real libraries | ||
37 | |||