From: Eike Rathke Date: Mon, 29 May 2017 14:25:37 +0000 (+0200) Subject: Re-enable building with ICU 59, tdf#108043 follow-up X-Git-Tag: archive/raspbian/1%5.4.0-1+rpi1~3^2~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=98bc22e796591c0345e6896e7626e55293d08c0e;p=libreoffice.git Re-enable building with ICU 59, tdf#108043 follow-up After having reverted to internal ICU 58, still be able to build with ICU 59. Change-Id: If2cf651aaacee5f64bee737f9da140b913ebd510 Reviewed-on: https://gerrit.libreoffice.org/38154 Reviewed-by: Eike Rathke Tested-by: Jenkins Gbp-Pq: Name icu-59-uchar.diff --- diff --git a/config_host.mk.in b/config_host.mk.in index 4078445c4a6..d96c0f8407a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -271,6 +271,7 @@ export ICU_MINOR=@ICU_MINOR@ export ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER=@ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER@ export ICU_RECLASSIFIED_HEBREW_LETTER=@ICU_RECLASSIFIED_HEBREW_LETTER@ export ICU_RECLASSIFIED_PREPEND_SET_EMPTY=@ICU_RECLASSIFIED_PREPEND_SET_EMPTY@ +export ICU_UCHAR_TYPE=@ICU_UCHAR_TYPE@ export INTROSPECTION_SCANNER=@INTROSPECTION_SCANNER@ export ILIB=@ILIB@ export INSTALLDIR=@INSTALLDIR@ diff --git a/configure.ac b/configure.ac index 1ba75a8a7bf..57b3e75d600 100644 Binary files a/configure.ac and b/configure.ac differ diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index f76606dbadd..616b59a503b 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -64,6 +64,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ ) \ + $(ICU_UCHAR_TYPE) \ $(if $(SYSTEM_LIBTOMMATH),$(LIBTOMMATH_CFLAGS), \ -L$(call gb_UnpackedTarball_get_dir,libtommath) \ ) \ diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index ea0635d4c31..7af90178805 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -46,7 +46,9 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(gb_COMPILERNOOPTFLAGS) $(gb_DEBUG_CFLAGS) \ $(gb_DEBUG_CXXFLAGS), \ $(gb_COMPILEROPTFLAGS)) \ - $(CXXFLAGS) $(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \ + $(CXXFLAGS) \ + $(ICU_UCHAR_TYPE) \ + $(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \ && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE) lib) \ ) diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index 86f93daf1b9..2cd41db242c 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --disable-werror \ --disable-weffc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \ + CXXFLAGS="$(CXXFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS) \ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 45b15f2f5eb..17065829014 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -38,7 +38,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ --disable-weffc \ - CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \ + CXXFLAGS="$(CXXFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS) \ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ XML_LIBS="$(LIBXML_LIBS)" \ diff --git a/external/libfreehand/ExternalProject_libfreehand.mk b/external/libfreehand/ExternalProject_libfreehand.mk index 15a17072e87..f1bbacbb06e 100644 --- a/external/libfreehand/ExternalProject_libfreehand.mk +++ b/external/libfreehand/ExternalProject_libfreehand.mk @@ -25,6 +25,7 @@ $(eval $(call gb_ExternalProject_use_externals,libfreehand,\ $(call gb_ExternalProject_get_state_target,libfreehand,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ + && export CXXFLAGS="$(CXXFLAGS) $(ICU_UCHAR_TYPE)" \ && MAKE=$(MAKE) ./configure \ --with-pic \ --enable-static \ diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index a168a62c636..808d74b2f57 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --disable-werror \ --disable-weffc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS) \ + CXXFLAGS="$(CXXFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS) \ -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index 884fde820d0..2f212ceac24 100644 --- a/external/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(CXXFLAGS) $(BOOST_CPPFLAGS)" \ + CXXFLAGS="$(CXXFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ )