mirror of
https://git.yoctoproject.org/poky
synced 2026-02-06 00:38:45 +01:00
python: Promote from meta-extras to meta
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5092 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
37
meta/packages/python/python-imaging/path.patch
Normal file
37
meta/packages/python/python-imaging/path.patch
Normal file
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user