diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-11-22 20:22:00 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2019-06-06 09:01:20 +0200 |
| commit | bed9ad4c8b1ff697db8d0858650371d0f864f6e6 (patch) | |
| tree | 6f339ea64fec9b0a6138733d6064cb42970480fd | |
| parent | 6c61e13f057814e6609cb7f554577381c74875eb (diff) | |
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@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@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index c2f6f3566318..e1ec30938bf7 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)),$(gb_STDLIBS))" +# 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 \ |