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

[Libreoffice Gerrit user]

 external/harfbuzz/UnpackedTarball_harfbuzz.mk |    6 ++++++
 external/harfbuzz/harfbuzz-rtti.patch         |   13 +++++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit a06f4c9c6ab09e3b30712a6c4d16ad5086ba2d9c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 8 11:14:13 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 8 14:05:06 2019 +0100

    ofz#13602 -fsanitize=vptr' not allowed with '-fno-rtti'
    
    Change-Id: I77beadee964f08f87f2fe7cc0daef5cb91151b72
    Reviewed-on: https://gerrit.libreoffice.org/68912
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 8101f244f4df..bfe7b2a9981d 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -21,4 +21,10 @@ $(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
new file mode 100644
index 000000000000..545e63981982
--- /dev/null
+++ b/external/harfbuzz/harfbuzz-rtti.patch
@@ -0,0 +1,13 @@
+--- 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*)