diff options
| author | Eike Rathke <erack@redhat.com> | 2017-05-29 16:25:37 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-05-29 18:24:51 +0200 |
| commit | c43a9c0f3e752e03b0d8dd135f67926918d0fb0f (patch) | |
| tree | f9cc0ca96a427e48024c0664e8622b046f804238 /external | |
| parent | 681ae3dfd031ce26c44a1069efc660e4691b4045 (diff) | |
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 <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 1 | ||||
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 4 | ||||
| -rw-r--r-- | external/libcdr/ExternalProject_libcdr.mk | 2 | ||||
| -rw-r--r-- | external/libebook/ExternalProject_libebook.mk | 2 | ||||
| -rw-r--r-- | external/libfreehand/ExternalProject_libfreehand.mk | 1 | ||||
| -rw-r--r-- | external/libmspub/ExternalProject_libmspub.mk | 2 | ||||
| -rw-r--r-- | external/libvisio/ExternalProject_libvisio.mk | 2 |
7 files changed, 9 insertions, 5 deletions
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 361fffc86c64..988a24b5ed74 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -66,6 +66,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 53490abc2eaa..070c58ea80a7 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -47,7 +47,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 86f93daf1b90..2cd41db242cd 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 45b15f2f5eb7..17065829014b 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 15a17072e872..f1bbacbb06e4 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 a168a62c636f..808d74b2f571 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 884fde820d00..2f212ceac249 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) \ ) |