summaryrefslogtreecommitdiff
path: root/external/libzmf
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-05-17 17:40:06 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-09-20 13:31:50 +0200
commit28e028680b3c0551db3a9b71c8fe6b66aac2433b (patch)
tree17688b5602e93c550775696a3c0dc0cdc090ddfa /external/libzmf
parent9b231713790c6e94eb64c3fc108ce99ebd2b90af (diff)
Remove legacy NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY support
...for ASan/UBSan builds using Clang older than current trunk twoards Clang 9, as announced at <https://lists.freedesktop.org/archives/libreoffice/2019-May/082654.html> "Re: [Libreoffice-commits] core.git: The -fvisibility-ms-compat hack is no longer needed for UBSan on Linux...". (And drop the no longer needed solenv/sanitizers/asan-suppressions, which people might still reference from their ASAN_OPTIONS.) Change-Id: Iedc0c5955366d2cbe7dc847990e2b1576750e85b Reviewed-on: https://gerrit.libreoffice.org/72493 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/libzmf')
-rw-r--r--external/libzmf/UnpackedTarball_libzmf.mk8
-rw-r--r--external/libzmf/ubsan-visibility.patch11
2 files changed, 0 insertions, 19 deletions
diff --git a/external/libzmf/UnpackedTarball_libzmf.mk b/external/libzmf/UnpackedTarball_libzmf.mk
index 5d5e7066572d..d37e16fcb711 100644
--- a/external/libzmf/UnpackedTarball_libzmf.mk
+++ b/external/libzmf/UnpackedTarball_libzmf.mk
@@ -11,16 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libzmf))
$(eval $(call gb_UnpackedTarball_set_tarball,libzmf,$(ZMF_TARBALL)))
-$(eval $(call gb_UnpackedTarball_set_patchlevel,libzmf,0))
-
$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libzmf))
-ifeq ($(NEED_CLANG_LINUX_UBSAN_RTTI_VISIBILITY),TRUE)
-$(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
- external/libzmf/ubsan-visibility.patch \
-))
-endif
-
$(eval $(call gb_UnpackedTarball_add_patches,libzmf, \
external/libzmf/android-workaround.patch.1 \
))
diff --git a/external/libzmf/ubsan-visibility.patch b/external/libzmf/ubsan-visibility.patch
deleted file mode 100644
index 90ead2b844b2..000000000000
--- a/external/libzmf/ubsan-visibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure
-+++ configure
-@@ -16787,7 +16787,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. */
-