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

[Libreoffice Gerrit user]

 external/harfbuzz/ExternalProject_harfbuzz.mk |    1 +
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |    6 ------
 external/harfbuzz/harfbuzz-rtti.patch         |   13 -------------
 3 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit a8727ea40b3b1334fd9a8a20ab559d338a065f17
Author:     Khaled Hosny <khaledhosny at eglug.org>
AuthorDate: Fri Mar 8 16:06:19 2019 +0200
Commit:     Khaled Hosny <khaledhosny at eglug.org>
CommitDate: Mon Mar 11 14:41:29 2019 +0100

    Add -frtti to HarfBuzz CXXFLAGS instead of paching configure.ac
    
    Change-Id: Ibc16c4e9c4a305d6fff764fcf3964a63c5322e14
    Reviewed-on: https://gerrit.libreoffice.org/68921
    Tested-by: Jenkins
    Reviewed-by: Khaled Hosny <khaledhosny at eglug.org>

diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk
index 82e10ecb76cc..b0bcc301cd66 100644
--- a/external/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/external/harfbuzz/ExternalProject_harfbuzz.mk
@@ -46,6 +46,7 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) :
 				$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
 				$(if $(ENABLE_OPTIMIZED), \
 					$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) \
+				$(if $(ENABLE_RUNTIME_OPTIMIZATIONS),,-frtti) \
 				$(CXXFLAGS) $(CXXFLAGS_CXX11) \
 				$(ICU_UCHAR_TYPE) \
 				$(if $(filter LINUX,$(OS)),-fvisibility=hidden)' \
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index bfe7b2a9981d..8101f244f4df 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -21,10 +21,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
     external/harfbuzz/msvc.patch \
 ))
 
-ifneq ($(ENABLE_RUNTIME_OPTIMIZATIONS),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-    external/harfbuzz/harfbuzz-rtti.patch \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/harfbuzz-rtti.patch b/external/harfbuzz/harfbuzz-rtti.patch
deleted file mode 100644
index 545e63981982..000000000000
--- a/external/harfbuzz/harfbuzz-rtti.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure
-+++ configure
-@@ -18959,9 +18959,7 @@
- 	# No threadsafe statics in C++ as we do it ourselves.
- 	# We don't use these features, so it's safe to disable them
- 	# even in the cases where we DO link to libstdc++.
--	# Put -fno-rtti before $CXXFLAGS such that users can re-enable it
--	# by overriding CXXFLAGS.
--	CXXFLAGS="-fno-rtti $CXXFLAGS -fno-exceptions -fno-threadsafe-statics"
-+	CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-threadsafe-statics"
- 
- 	case "$host" in
- 		*-*-mingw*)