From f20fd6617ceb8fdf061435981b24a33d8ecece350c8f14b4ce7f61f3a3de2366 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Tue, 14 May 2019 11:37:01 +0000
Subject: [PATCH] Accepting request 700080 from
 home:marxin:branches:devel:tools:building

- Add gcc9-sanitizer.patch in order to handle unresolved symbols with
  -fsanitize=*. It's caused by sanitizer wrappers and our default --as-needed
  that we use as SUSE in our linker build (boo#1127953).

OBS-URL: https://build.opensuse.org/request/show/700080
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/meson?expand=0&rev=136
---
 gcc9-sanitizer.patch | 13 +++++++++++++
 meson.changes        |  7 +++++++
 meson.spec           |  2 ++
 3 files changed, 22 insertions(+)
 create mode 100644 gcc9-sanitizer.patch

diff --git a/gcc9-sanitizer.patch b/gcc9-sanitizer.patch
new file mode 100644
index 0000000..1f9cd50
--- /dev/null
+++ b/gcc9-sanitizer.patch
@@ -0,0 +1,13 @@
+diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
+index e27ae2b..bc10824 100644
+--- a/mesonbuild/compilers/compilers.py
++++ b/mesonbuild/compilers/compilers.py
+@@ -427,7 +427,7 @@ def sanitizer_compile_args(value):
+ def sanitizer_link_args(value):
+     if value == 'none':
+         return []
+-    args = ['-fsanitize=' + value]
++    args = ['-fsanitize=' + value, '-ldl', '-lrt', '-lm', '-lpthread']
+     return args
+ 
+ def option_enabled(boptions, options, option):
diff --git a/meson.changes b/meson.changes
index 14b9d7e..2220e86 100644
--- a/meson.changes
+++ b/meson.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May  2 11:06:47 UTC 2019 - Martin Liška <mliska@suse.cz>
+
+- Add gcc9-sanitizer.patch in order to handle unresolved symbols with
+  -fsanitize=*. It's caused by sanitizer wrappers and our default --as-needed
+  that we use as SUSE in our linker build (boo#1127953).
+
 -------------------------------------------------------------------
 Wed Apr 17 11:51:11 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/meson.spec b/meson.spec
index c94cf3a..3c71e5c 100644
--- a/meson.spec
+++ b/meson.spec
@@ -49,6 +49,7 @@ Patch3:         meson-suse-fix-llvm-3.8.patch
 Patch4:         meson-fix-gcc48.patch
 # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal@suse.com -- build and install using distutils instead of full setuptools
 Patch5:         meson-distutils.patch
+Patch6:         gcc9-sanitizer.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 BuildRequires:  python3-base
@@ -160,6 +161,7 @@ This package provides support for meson.build files in Vim.
 %if !%{with setuptools}
 %patch5 -p1
 %endif
+%patch6 -p1
 
 # Remove static boost tests from "test cases/frameworks/1 boost/".
 sed -i "/static/d" test\ cases/frameworks/1\ boost/meson.build