external/liborcus/ExternalProject_liborcus.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 0aed9cbb6c6e8e048a90fed61f44efbe09efac4f
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Jun 5 14:06:39 2015 +0200
liborcus: still build statically on Android
Change-Id: Ieeb5180ea7f96cb08d06bf895bd2a6ffc6c1cef0
diff --git a/external/liborcus/ExternalProject_liborcus.mk
b/external/liborcus/ExternalProject_liborcus.mk
index 8a53fa8..12f22f7 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -87,8 +87,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
MDDS_LIBS=' ' \
MAKE=$(MAKE) ./configure \
--with-pic \
- --enable-shared \
- --disable-static \
+ $(if $(filter IOS ANDROID,$(OS)), --disable-shared
--enable-static, --enable-shared --disable-static) \
$(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \
--disable-spreadsheet-model \
--without-tools \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
