[Libreoffice-commits] core.git: 2 commits - external/libwps

[Stephan Bergmann]

 external/libwps/ExternalProject_libwps.mk |    2 +-
 external/libwps/UnpackedTarball_libwps.mk |    8 ++++++++
 external/libwps/ubsan-visibility.patch.0  |   11 +++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit c5ca7ede1d330dad73355bc9769b2ca9db1fc66b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 12 10:25:51 2015 +0200

    For Clang -fsanitize=vptr use -fvisibility-ms-compat, not -fvisibility=hidden
    
    ...same as f0aa1a78fb209310e8baef53c02f365fca518d11
    
    Change-Id: I89e20a57125012a6805b8d61ec668068b7149be2

diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 77662a7..39f4e6d 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -18,4 +18,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
 	external/libwps/0001-error-C2065-M_PI-undeclared-identifier.patch \
 ))
 
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(CC)),)
+$(eval $(call gb_UnpackedTarball_add_patches,libwps, \
+    external/libwps/ubsan-visibility.patch.0 \
+))
+endif
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/external/libwps/ubsan-visibility.patch.0 b/external/libwps/ubsan-visibility.patch.0
new file mode 100644
index 0000000..50efe41
--- /dev/null
+++ b/external/libwps/ubsan-visibility.patch.0
@@ -0,0 +1,11 @@
+--- configure
++++ configure
+@@ -16632,7 +16632,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.  */
+ 
commit 45cf2e2c58c3d113632f5b9c776df3d15df816f9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jun 12 10:24:42 2015 +0200

    Pass -fvisibility-inlines-hidden into external/libwps
    
    ...same as fc6f894d2211cee7b28cb93345e90297ec04fe06
    
    Change-Id: I14eb43ec78373863fe996ed50863d7681fd2e229

diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index 42cf8a4..df0d020 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -35,7 +35,7 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
 			--disable-debug \
 			--disable-werror \
 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& $(MAKE) \