From 5ffd428ed60c18b0b131cb7584c538187b57fae7 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Tue, 15 Nov 2011 00:38:48 +0000 Subject: [PATCH] packages/python-imaging-library: fix cross compile SVN-Revision: 29141 --- lang/python-imaging-library/Makefile | 2 +- .../patches/101-cross_compile.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 lang/python-imaging-library/patches/101-cross_compile.patch diff --git a/lang/python-imaging-library/Makefile b/lang/python-imaging-library/Makefile index 12a3ed5a94..128327cfe9 100644 --- a/lang/python-imaging-library/Makefile +++ b/lang/python-imaging-library/Makefile @@ -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 index 0000000000..fee0e82494 --- /dev/null +++ b/lang/python-imaging-library/patches/101-cross_compile.patch @@ -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 + -- 2.30.2