diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-23 11:45:40 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-23 11:45:40 +0100 |
| commit | 451b1c687105655a4f2c9c477b05535041e25060 (patch) | |
| tree | 3db315590172cd6244107a97a6603add934d7e32 /recipes/python/python-imaging | |
| parent | 6767ca50430e37cdad0a8992b73c3f82ead134bf (diff) | |
| parent | e2b99b79f516a7466dc050902cee62f39869bf9d (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/python/python-imaging')
| -rw-r--r-- | recipes/python/python-imaging/path.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes/python/python-imaging/path.patch b/recipes/python/python-imaging/path.patch new file mode 100644 index 0000000000..1dc467a56d --- /dev/null +++ b/recipes/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 + |