strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No need to fiddle with ICU UChar typedef anymore

Browse source 
The affected external dependencies should be building with c++11 by now
already.

Change-Id: I0d1f8aed6ed28f510f456a368b724c3c4eeb3240
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153389
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>
This commit is contained in:
Khaled Hosny 2023-06-21 13:26:35 +03:00 committed by خالد حسني
parent c276694bc0
commit 40e43ae633
5 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config_host.mk.in
View file

@ -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@

7
configure.ac
View file

@ -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

1
external/harfbuzz/ExternalProject_harfbuzz.mk vendored
View file

@ -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) \

2
external/libebook/ExternalProject_libebook.mk vendored
View file

@ -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)" \

2
external/libmspub/ExternalProject_libmspub.mk vendored
View file

@ -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: