Kaydet (Commit) 4c1c61ce authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Revert "Try this crack then instead: explioitly build freetype first for Android"

Nah, that didn't work either, cairo needs fontconfig, too, and that
needs expat, it gets complicated, sigh.

This reverts commit 35d5eeff.
üst eb66f794
...@@ -410,10 +410,6 @@ endif ...@@ -410,10 +410,6 @@ endif
ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
# Ditto for dbconnectivity in the --disable-database-connectivity case # 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 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 endif
cd packimages && unset MAKEFLAGS && \ cd packimages && unset MAKEFLAGS && \
$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) && \ $(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM) && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment