Makefile.top | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 35d5eeff13ae7ed91c27f05b8d8411039ac43d64
Author: Tor Lillqvist <tlillqv...@suse.com>
Date: Wed Nov 7 00:12:51 2012 +0200
Try this crack then instead: explioitly build freetype first for Android
Change-Id: Ia7674bb1849ef870e540412fd496b2eaddfc09c5
diff --git a/Makefile.top b/Makefile.top
index 1a56a3a..bab03ff 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -411,6 +411,10 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
# Ditto for dbconnectivity in the --disable-database-connectivity case
cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/'
<../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh &&
$(SOLARENV)/bin/deliver.pl
endif
+ifeq ($(OS),ANDROID)
+# Cairo needs freetype
+ cd freetype && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
+endif
cd packimages && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all --
-P$(PARALLELISM) && \
$(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
