[Libreoffice-commits] core.git: external/icu

[Caolán McNamara]

 external/icu/ExternalProject_icu.mk |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 91b34f1a57213c1806bef6cdbd8ca113b65fe671
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Dec 19 21:25:30 2016 +0000

    static icu tweaking
    
    Change-Id: Ic882b4d1a5b5eaee9e8c38a0c8dbe7cd39590b9c
    Reviewed-on: https://gerrit.libreoffice.org/32219
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index d5d98ff..97f3975 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -83,12 +83,10 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 			$(if $(filter ANDROID EMSCRIPTEN,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
 			$(if $(filter SOLARIS AIX,$(OS)),--disable-64bit-libs) \
 			$(if $(filter TRUE,$(DISABLE_DYNLOADING)),\
-				--enable-static --disable-shared,\
+				--with-data-packaging=static --enable-static --disable-shared --disable-dyload,\
 				--disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\
 				--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
-			$(if $(filter IOS,$(OS)), \
-				--with-data-packaging=archive) \
 		&& $(MAKE) \
 		$(if $(filter MACOSX,$(OS)), \
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \