summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2022-08-27 10:12:36 +0100
committerCaolán McNamara <caolanm@redhat.com>2022-08-27 12:45:52 +0200
commit995ae3dc84a9c220b62086664c8ad4a161401cc7 (patch)
tree1039e2065b80567b16d6df11769a63439576972c
parent85ab77d241ce3bc6adca26d541873583bce2d9d0 (diff)
ofz: -Wp,-D_FORTIFY_SOURCE=2 in cairo a problem with msan
Change-Id: I5c7bc7b9a370ee3a5c7dd3f7a2c92c5f2b193d58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138920 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--external/cairo/cairo/san.patch.012
1 files changed, 12 insertions, 0 deletions
diff --git a/external/cairo/cairo/san.patch.0 b/external/cairo/cairo/san.patch.0
index 272fef628aee..54cf805d5865 100644
--- a/external/cairo/cairo/san.patch.0
+++ b/external/cairo/cairo/san.patch.0
@@ -1,3 +1,15 @@
+--- configure 2022-08-27 10:09:35.721992976 +0100
++++ configure 2022-08-27 10:10:00.363873391 +0100
+@@ -14940,7 +14940,8 @@
+
+ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+
+-MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
++# breaks msan
++# MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+
+ # invalidate cached value if MAYBE_WARN has changed
+ if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
--- src/cairo-fixed-private.h
+++ src/cairo-fixed-private.h
@@ -61,7 +61,7 @@