packages/python-imaging-library: fix cross compile
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 15 Nov 2011 00:38:48 +0000 (00:38 +0000)
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 15 Nov 2011 00:38:48 +0000 (00:38 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@29141 3c298f89-4303-0410-b956-a3cf2f4a3e73

lang/python-imaging-library/Makefile
lang/python-imaging-library/patches/101-cross_compile.patch [new file with mode: 0644]

index 12a3ed5..128327c 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-imaging-library
 PKG_VERSION:=1.1.7
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=Imaging-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://effbot.org/downloads
diff --git a/lang/python-imaging-library/patches/101-cross_compile.patch b/lang/python-imaging-library/patches/101-cross_compile.patch
new file mode 100644 (file)
index 0000000..fee0e82
--- /dev/null
@@ -0,0 +1,33 @@
+--- a/setup.py 2011-11-15 01:06:00.000000000 +0100
++++ b/setup.py 2011-11-15 01:07:32.000000000 +0100
+@@ -147,7 +147,6 @@
+             add_directory(library_dirs, "/opt/local/lib")
+             add_directory(include_dirs, "/opt/local/include")
+-        add_directory(library_dirs, "/usr/local/lib")
+         # FIXME: check /opt/stuff directories here?
+         prefix = sysconfig.get_config_var("prefix")
+@@ -199,22 +198,6 @@
+             add_directory(include_dirs, include_root)
+         #
+-        # add standard directories
+-
+-        # look for tcl specific subdirectory (e.g debian)
+-        if _tkinter:
+-            tcl_dir = "/usr/include/tcl" + TCL_VERSION
+-            if os.path.isfile(os.path.join(tcl_dir, "tk.h")):
+-                add_directory(include_dirs, tcl_dir)
+-
+-        # standard locations
+-        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