external/liborcus/ExternalProject_liborcus.mk | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit b46276e6c02b22441f87b2bf689e2aa61f806688
Author: David Tardon <dtar...@redhat.com>
Date: Fri Jun 5 14:35:21 2015 +0200
better way to do this
Change-Id: I4a18927f2c9b6414134e5ea016121693ac47ecf9
diff --git a/external/liborcus/ExternalProject_liborcus.mk
b/external/liborcus/ExternalProject_liborcus.mk
index 12f22f7..c9adc47 100644
--- a/external/liborcus/ExternalProject_liborcus.mk
+++ b/external/liborcus/ExternalProject_liborcus.mk
@@ -87,7 +87,11 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
MDDS_LIBS=' ' \
MAKE=$(MAKE) ./configure \
--with-pic \
- $(if $(filter IOS ANDROID,$(OS)), --disable-shared
--enable-static, --enable-shared --disable-static) \
+ $(if $(DISABLE_DYNLOADING), \
+ --enable-static --disable-shared \
+ , \
+ --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
