From 0d1c24e5f63fb31538d708e9842cec121e3e3f98 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Thu, 19 Apr 2012 21:10:00 +0300
Subject: Build freetype and fontconfig statically for Android

---
 fontconfig/makefile.mk | 4 +++-
 fontconfig/prj/d.lst   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'fontconfig')

diff --git a/fontconfig/makefile.mk b/fontconfig/makefile.mk
index a866c4c85a43..55375c6758be 100644
--- a/fontconfig/makefile.mk
+++ b/fontconfig/makefile.mk
@@ -47,8 +47,10 @@ CONFIGURE_ACTION=./configure
 CONFIGURE_ACTION!:=CFLAGS=-g $(CONFIGURE_ACTION)
 .ENDIF
 
+# This "bundled" fontconfig is built only when cross-compiling for Android
+
 CONFIGURE_FLAGS=\
-    --disable-static \
+    --disable-shared \
     --with-arch=arm \
     --with-expat-includes=$(SOLARVER)/$(INPATH)/inc/external \
     --with-expat-lib=$(SOLARVER)/$(INPATH)/lib \
diff --git a/fontconfig/prj/d.lst b/fontconfig/prj/d.lst
index 1e2a4e17fdbb..aeb7edf32a7e 100644
--- a/fontconfig/prj/d.lst
+++ b/fontconfig/prj/d.lst
@@ -1,4 +1,4 @@
-..\%__SRC%\misc\build\fontconfig*\src\.libs\*.so %_DEST%\lib
+..\%__SRC%\misc\build\fontconfig*\src\.libs\*.a %_DEST%\lib
 
 mkdir: %_DEST%\inc\external\fontconfig
 ..\%__SRC%\misc\build\fontconfig*\fontconfig\*.h %_DEST%\inc\external\fontconfig
-- 
cgit