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

[Christian Lohmaier]

 external/icu/ExternalProject_icu.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5030bde7975746df79f11bd569e75ad449dfd4d0
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Wed Nov 22 20:22:00 2017 +0100

    icu: don't skip building the data just because tools were disabled
    
    building for e.g. android disables the tests and requests data in a
    static library, but icu completely skips building the data directory in
    case --disable-tools was specified:
    icu/source/Makefile.in
        @TOOLS_TRUE at DATASUBDIR = data
    will become
        #DATASUBDIR = data
    and then
        SUBDIRS =  stubdata common i18n $(LAYOUTEX) $(ICUIO) $(TOOLS) $(DATASUBDIR) $(EXTRA) $(SAMPLE) $(TEST)
    will not have the data dir and make will ignore it.  Add it back by
    specifying it when invoking make and all is fine.
    
    Change-Id: I0af693f22938ebabdc189a97f1cfc3f8b1c042ee
    Reviewed-on: https://gerrit.libreoffice.org/45107
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 1a9c5ff90602..5bceb14e373b 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -58,6 +58,9 @@ icu_LDFLAGS:=" \
 	    -Wl$(COMMA)-Bsymbolic-functions -Wl$(COMMA)--dynamic-list-cpp-new -Wl$(COMMA)--dynamic-list-cpp-typeinfo) \
     $(if $(filter ANDROID,$(OS)),-lgnustl_shared -lm)"
 
+# DATASUBDIR=data in cross-compiling case, because --disable-tools completely skips the
+# data directory/doesn't build the requested library in that case (icu/source/Makefile.in)
+# so we need to add it back to the list of subdirectories to build
 $(call gb_ExternalProject_get_state_target,icu,build) :
 	$(call gb_ExternalProject_run,build,\
 		CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
@@ -73,7 +76,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 				--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) \
-		&& $(MAKE) \
+		&& $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) \
 		$(if $(filter MACOSX,$(OS)), \
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \
 				URELIB \