diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | external/harfbuzz/ExternalProject_harfbuzz.mk | 1 | ||||
| -rw-r--r-- | external/libebook/ExternalProject_libebook.mk | 2 | ||||
| -rw-r--r-- | external/libmspub/ExternalProject_libmspub.mk | 2 |
5 files changed, 2 insertions, 11 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 4652474720b7..0d857cf6043c 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -330,7 +330,6 @@ export ICU_CFLAGS=$(gb_SPACE)@ICU_CFLAGS@ export ICU_LIBS=$(gb_SPACE)@ICU_LIBS@ export ICU_MAJOR=@ICU_MAJOR@ export ICU_MINOR=@ICU_MINOR@ -export ICU_UCHAR_TYPE=@ICU_UCHAR_TYPE@ export INTROSPECTION_SCANNER=@INTROSPECTION_SCANNER@ export ILIB=@ILIB@ export ILIB_FOR_BUILD=@ILIB_FOR_BUILD@ diff --git a/configure.ac b/configure.ac index a494a2bd9515..cd5338c42dd2 100644 --- a/configure.ac +++ b/configure.ac @@ -10779,18 +10779,11 @@ if test "$SYSTEM_ICU" = TRUE; then fi fi -# As of ICU 59 it defaults to typedef char16_t UChar; which is available -# with -std=c++11 but not all external libraries can be built with that, -# for those use a bit-compatible typedef uint16_t UChar; see -# icu/source/common/unicode/umachine.h -ICU_UCHAR_TYPE="-DUCHAR_TYPE=uint16_t" - AC_SUBST(SYSTEM_GENBRK) AC_SUBST(SYSTEM_GENCCODE) AC_SUBST(SYSTEM_GENCMN) AC_SUBST(ICU_MAJOR) AC_SUBST(ICU_MINOR) -AC_SUBST(ICU_UCHAR_TYPE) dnl ================================================================== dnl Breakpad diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index f7767f7a7782..9c8dd804e8f0 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -47,7 +47,6 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : $(call gb_ExternalProject_get_build_flags,harfbuzz) \ $(if $(ENABLE_RUNTIME_OPTIMIZATIONS),,-frtti) \ $(CXXFLAGS) $(CXXFLAGS_CXX11) \ - $(ICU_UCHAR_TYPE) \ $(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \ LDFLAGS="$(call gb_ExternalProject_get_link_flags,harfbuzz)" \ MAKE=$(MAKE) \ diff --git a/external/libebook/ExternalProject_libebook.mk b/external/libebook/ExternalProject_libebook.mk index 3a3df8c71b00..9760be7d298b 100644 --- a/external/libebook/ExternalProject_libebook.mk +++ b/external/libebook/ExternalProject_libebook.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libebook,build) : --disable-werror \ --disable-weffc \ CXXFLAGS="$(gb_CXXFLAGS) $(call gb_ExternalProject_get_build_flags,libebook)" \ - CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ LDFLAGS="$(call gb_ExternalProject_get_link_flags,libebook)" \ LANGTAG_CFLAGS="$(LIBLANGTAG_CFLAGS)" \ LANGTAG_LIBS="$(LIBLANGTAG_LIBS)" \ diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index 7e7153e75416..b43fc8f1998c 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -22,7 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\ zlib \ )) -libmspub_CPPFLAGS := $(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS) +libmspub_CPPFLAGS := $(CPPFLAGS) $(BOOST_CPPFLAGS) # Needed when workdir/UnpackedTarball/libmspub/src/lib/MSPUBCollector.cpp includes Boost 1.79.0 # boost/multi_array.hpp, which indirectly includes # workdir/UnpackedTarball/boost/boost/functional.hpp using std::unary_/binary_function: |