8000 Merge branch 'master' of github.com:olymk2/python-for-android · olymk2/python-for-android@f72895c · GitHub
[go: up one dir, main page]

Skip to content

Commit f72895c

Browse files
author
Oliver Marks
committed
Merge branch 'master' of github.com:olymk2/python-for-android
2 parents a43d8a5 + 7f35d85 commit f72895c

File tree

1 file changed

+21
-7
lines changed

1 file changed

+21
-7
lines changed

recipes/harfbuzz/recipe.sh

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,34 @@ function shouldbuild_harfbuzz() {
2020

2121
function build_harfbuzz() {
2222
cd $BUILD_harfbuzz
23-
2423
push_arm
25-
#~ export LDFLAGS="-L$LIBS_PATH"
26-
#~ export LDSHARED="$LIBLINK"
27-
#try ./configure --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --enable-shared --without-freetype --without-glib
28-
#~ try ./autogen.sh --build=i686-pc-linux-gnu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib
2924
try ./configure --without-icu --host=arm-linux-androideabi --prefix="$BUILD_PATH/python-install" --without-freetype --without-glib
3025
try make -j5
3126
pop_arm
32-
try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH
3327
}
3428

3529
# function called after all the compile have been done
3630
function postbuild_harfbuzz() {
37-
true
31+
ln -s $BUILD_freetype "$BUILD_PATH/freetype2"
32+
if [ -f "$BUILD_freetype/objs/.libs/libfreetype.so" ]; then
33+
echo "freetype found rebuilding harfbuzz with freetype support";
34+
#true
35+
echo $BUILD_PATH;
36+
#build again now that freetype has finished
37+
cd $BUILD_harfbuzz
38+
echo $BUILD_freetype;
39+
ls $BUILD_freetype;
40+
41+
export LDFLAGS="-L$BUILD_freetype/objs/.libs/ $LDFLAGS"
42+
export CFLAGS="-I$BUILD_freetype/include/ -I$BUILD_freetype/ -I$BUILD_PATH/python-install/include/python2.7 $CFLAGS"
43+
export CPPFLAGS="-I$BUILD_freetype/include/ -I$BUILD_PATH/python-install/include/python2.7 $CPPFLAGS"
44+
export CC="-I$BUILD_freetype/include/ $CC "
45+
export LDSHARED="$LIBLINK"
46+
push_arm
47+
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/"
48+
try make --include-dir="$BUILD_freetype/include/" #-j5
49+
pop_arm
50+
try cp -L $BUILD_harfbuzz/src/.libs/libharfbuzz.so $LIBS_PATH
51+
fi
3852
}
3953

0 commit comments

Comments
 (0)
0