external/libetonyek/UnpackedTarball_libetonyek.mk | 8 ++++++++
external/libetonyek/ubsan-visibility.patch | 11 +++++++++++
2 files changed, 19 insertions(+)
New commits:
commit 1dbc9e022e750a16dbf5b530783c4adaafd609f5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu May 21 15:29:59 2015 +0100
For Clang -fsanitize=vptr use -fvisibility-ms-compat, not
-fvisibility=hidden
...same as f0aa1a78fb209310e8baef53c02f365fca518d11
Change-Id: Ib02a20677eaaf2930bf3620c4ed2b1c3c098ce00
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 4706d02..c531894 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -19,4 +19,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/win_build.patch.1 \
))
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \
+ external/libetonyek/ubsan-visibility.patch \
+))
+endif
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/external/libetonyek/ubsan-visibility.patch
b/external/libetonyek/ubsan-visibility.patch
new file mode 100644
index 0000000..925f4a8
--- /dev/null
+++ b/external/libetonyek/ubsan-visibility.patch
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -17443,7 +17443,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
-fvisibility=hidden compiler flag" >&5
+ $as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; }
+ saved_CXXFLAGS="$CXXFLAGS"
+- CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
++ CXXFLAGS="$CXXFLAGS -fvisibility-ms-compat"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
