SHA256
1
0
forked from pool/meson

Accepting request 702823 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/702823
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger 2019-05-17 21:37:10 +00:00 committed by Git OBS Bridge
commit d01db2621f
3 changed files with 22 additions and 0 deletions

13
gcc9-sanitizer.patch Normal file
View File

@ -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):

View File

@ -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>

View File

@ -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