summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2020-02-15 13:37:36 -0600
committerWilliam Hubbs <williamh@gentoo.org>2020-02-15 13:55:30 -0600
commited2b0ce5a79be885ef18d5198e14c6bf236b9e23 (patch)
treef65538ff318a4e77296a1db5ba0587b04a1344ce /dev-util/meson/files
parentdev-perl/DBD-mysql: stable 4.50.0 for sparc, bug #709628 (diff)
downloadgentoo-ed2b0ce5a79be885ef18d5198e14c6bf236b9e23.tar.gz
gentoo-ed2b0ce5a79be885ef18d5198e14c6bf236b9e23.tar.bz2
gentoo-ed2b0ce5a79be885ef18d5198e14c6bf236b9e23.zip
dev-util/meson: 0.53.1 bump
Signed-off-by: William Hubbs <williamh@gentoo.org>
Diffstat (limited to 'dev-util/meson/files')
-rw-r--r--dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch27
-rw-r--r--dev-util/meson/files/0.53.1-remove-asan.patch27
2 files changed, 54 insertions, 0 deletions
diff --git a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
new file mode 100644
index 000000000000..4ee11829904d
--- /dev/null
+++ b/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch
@@ -0,0 +1,27 @@
+From 75f2d7a004387edc7a7e73da5097bf01daf38769 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Sat, 15 Feb 2020 12:24:42 -0600
+Subject: [PATCH 1/2] remove asan ld_preload
+
+ASAN and sandbox both want control over LD_PRELOAD
+https://bugs.gentoo.org/673016
+---
+ run_unittests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index 676604f4..1c9aaf0c 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -4985,7 +4985,7 @@ class LinuxlikeTests(BasePlatformTests):
+ r'Run-time dependency qt5 \(modules: Core\) found: YES 5.* \(pkg-config\)\n')
+
+ @skip_if_not_base_option('b_sanitize')
+- def test_generate_gir_with_address_sanitizer(self):
++ def _test_generate_gir_with_address_sanitizer(self):
+ if is_cygwin():
+ raise unittest.SkipTest('asan not available on Cygwin')
+ if is_openbsd():
+--
+2.24.1
+
diff --git a/dev-util/meson/files/0.53.1-remove-asan.patch b/dev-util/meson/files/0.53.1-remove-asan.patch
new file mode 100644
index 000000000000..4cc2aead0ba6
--- /dev/null
+++ b/dev-util/meson/files/0.53.1-remove-asan.patch
@@ -0,0 +1,27 @@
+From 9ddb289ca9611281a45734d92fdfd2d5fb83f050 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Sat, 15 Feb 2020 12:28:35 -0600
+Subject: [PATCH 2/2] remove asan
+
+ASAN is unsupported on some targets
+https://bugs.gentoo.org/692822
+---
+ run_unittests.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index 1c9aaf0c..171ee0f0 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -5475,7 +5475,7 @@ class LinuxlikeTests(BasePlatformTests):
+ self.assertEqual(install_rpath, 'baz')
+
+ @skip_if_not_base_option('b_sanitize')
+- def test_pch_with_address_sanitizer(self):
++ def _test_pch_with_address_sanitizer(self):
+ if is_cygwin():
+ raise unittest.SkipTest('asan not available on Cygwin')
+ if is_openbsd():
+--
+2.24.1
+