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

[Libreoffice Gerrit user]

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

New commits:
commit f09836cae28eaf43b895d9ee14f071f5e1248623
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 9 14:48:07 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Sep 9 16:56:10 2018 +0200

    ofz#10100 use --disable-release to avoid icu adding extra link flags
    
    so only use our passed in link flags, and so avoid failing under oss-fuzz with
    linker problem
    
    https://github.com/google/oss-fuzz/issues/1789
    
    and revert the interim hackery to narrow down the problem
    
    Change-Id: Ic92f65ac3895d36a2917281c260e177caf2d31f5
    Reviewed-on: https://gerrit.libreoffice.org/60216
    Tested-by: Jenkins
    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 f0ce0d3b4c62..052a7c3c3dd9 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -65,8 +65,8 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 		CPPFLAGS=$(icu_CPPFLAGS) CFLAGS=$(icu_CFLAGS) \
 		CXXFLAGS=$(icu_CXXFLAGS) LDFLAGS=$(icu_LDFLAGS) \
 		./configure \
-			ac_cv_namespace_ok=yes \
 			--disable-layout --disable-samples \
+			$(if $(filter FUZZERS,$(BUILD_TYPE)),--disable-release) \
 			$(if $(CROSS_COMPILING),--disable-tools --disable-extras) \
 			$(if $(filter IOS ANDROID,$(OS)),--disable-dyload) \
 			$(if $(filter ANDROID,$(OS)),--disable-strict ac_cv_c_bigendian=no) \
@@ -75,7 +75,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
 				--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) || cat config.log \
+				--with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \
 		&& $(MAKE) $(if $(CROSS_COMPILING),DATASUBDIR=data) \
 		$(if $(filter MACOSX,$(OS)), \
 			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \