use SED instead of sed + fix PIL build on osx (not tested). closes #47

kivy · Aug 31, 2012 · 54814e1 · 54814e1
1 parent 51f8025
commit 54814e1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/recipes/libxml2/recipe.sh b/recipes/libxml2/recipe.sh
@@ -22,8 +22,8 @@ function build_libxml2() {
 
 	try ./configure --build=i686-pc-linux-gnu --host=arm-linux-eabi \
 		--without-modules --without-legacy --without-history --without-debug --without-docbook --without-python
-	try sed -i 's/ runtest\$(EXEEXT) \\/ \\/' Makefile
-	try sed -i 's/ testrecurse\$(EXEEXT)$//' Makefile
+	try $SED 's/ runtest\$(EXEEXT) \\/ \\/' Makefile
+	try $SED 's/ testrecurse\$(EXEEXT)$//' Makefile
 	try make
 
 	pop_arm

diff --git a/recipes/pil/patches/disable-tk.patch b/recipes/pil/patches/disable-tk.patch
@@ -0,0 +1,12 @@
+--- Imaging-1.1.7/setup.py.orig	2012-08-31 12:52:25.000000000 +0200
++++ Imaging-1.1.7/setup.py	2012-08-31 12:53:04.000000000 +0200
+@@ -322,7 +322,7 @@
+                 "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra
+                 ))
+
+-        if sys.platform == "darwin":
++        if False: #sys.platform == "darwin":
+             # locate Tcl/Tk frameworks
+             frameworks = []
+             framework_roots = [
+
diff --git a/recipes/pil/recipe.sh b/recipes/pil/recipe.sh
@@ -21,9 +21,11 @@ function prebuild_pil() {
 
 	LIBS="$SRC_PATH/obj/local/$ARCH"
 	try cp setup.py.tmpl setup.py
-	try sed -i s:_LIBS_:$LIBS: setup.py
-	try sed -i s:_JNI_:$JNI_PATH: setup.py
-	try sed -i s:_NDKPLATFORM_:$NDKPLATFORM: setup.py
+	try $SED s:_LIBS_:$LIBS: setup.py
+	try $SED s:_JNI_:$JNI_PATH: setup.py
+	try $SED s:_NDKPLATFORM_:$NDKPLATFORM: setup.py
+
+	try patch -p1 < $RECIPE_pil/patches/disable-tk.patch
 
 	# everything done, touch the marker !
 	touch .patched