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

[Stephan Bergmann]

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

New commits:
commit 7ad758a53a7cef0ed7b39182d45a64be427b1394
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 13 15:55:26 2015 +0100

    external/harfbuzz: -fsanitize=vptr needs -frtti
    
    Change-Id: I4da774b8ebd2115a7f1ae717843498c0f452f7df

diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 1f9f15f..9a5560f 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -17,4 +17,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
     external/harfbuzz/ubsan.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 0000000..94b4dae
--- /dev/null
+++ b/external/harfbuzz/harfbuzz-rtti.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -16799,7 +16799,7 @@
+ 	LDFLAGS="$LDFLAGS -Bsymbolic-functions"
+ 
+ 	# Make sure we don't link to libstdc++
+-	CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
++	CXXFLAGS="$CXXFLAGS -fno-exceptions"
+ 
+ 	# Assorted warnings
+ 	CXXFLAGS="$CXXFLAGS -Wcast-align"