Merge branch 'master' of github.com:olymk2/python-for-android

Oliver Marks · Oliver Marks · commit f72895cc004c · 2015-06-25T14:33:04.000+01:00
diff --git a/recipes/harfbuzz/recipe.sh b/recipes/harfbuzz/recipe.sh
@@ -20,20 +20,34 @@ function shouldbuild_harfbuzz() {
 
 function build_harfbuzz() {
     cd $BUILD_harfbuzz
-
     push_arm
-	#~ export LDFLAGS="-L$LIBS_PATH"
-	#~ export LDSHARED="$LIBLINK"
-    #try ./configure --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --enable-shared --without-freetype --without-glib
-    #~ try ./autogen.sh  --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib
     try ./configure --without-icu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib
     try make -j5
     pop_arm
-    try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH
 }
 
 # function called after all the compile have been done
 function postbuild_harfbuzz() {
-    true
+    ln -s $BUILD_freetype "$BUILD_PATH/freetype2"
+    if [ -f "$BUILD_freetype/objs/.libs/libfreetype.so" ]; then
+        echo "freetype found rebuilding harfbuzz with freetype support";
+	#true
+	echo $BUILD_PATH;
+    #build again now that freetype has finished
+    cd $BUILD_harfbuzz
+    echo $BUILD_freetype;
+    ls $BUILD_freetype;
+    
+    export LDFLAGS="-L$BUILD_freetype/objs/.libs/ $LDFLAGS"
+    export CFLAGS="-I$BUILD_freetype/include/ -I$BUILD_freetype/ -I$BUILD_PATH/python-install/include/python2.7 $CFLAGS"
+    export CPPFLAGS="-I$BUILD_freetype/include/ -I$BUILD_PATH/python-install/include/python2.7 $CPPFLAGS"
+    export CC="-I$BUILD_freetype/include/ $CC "
+    export LDSHARED="$LIBLINK"
+    push_arm
+    try ./configure --without-icu --host=arm-linux-androideabi --cross-compile --prefix="$BUILD_PATH/python-install" --without-glib --libdir="$BUILD_freetype/objs/.libs/" --includedir="$BUILD_freetype/include/"
+    try make  --include-dir="$BUILD_freetype/include/" #-j5
+    pop_arm
+    try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH
+    fi
 }
 
