diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-util/meson/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-util/meson/files')
-rw-r--r-- | dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch | 46 | ||||
-rw-r--r-- | dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch | 27 | ||||
-rw-r--r-- | dev-util/meson/files/0.53.1-remove-asan.patch | 27 |
3 files changed, 0 insertions, 100 deletions
diff --git a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch b/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch deleted file mode 100644 index ec753e00230a..000000000000 --- a/dev-util/meson/files/0.52.1-test_pkgconfig_gen_deps.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ce668f9163e1c912382eeb0e6ae40d123c0cca9 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Mon, 13 Jan 2020 23:46:09 -0500 -Subject: [PATCH] test_pkgconfig_gen_deps: set - PKG_CONFIG_SYSTEM_LIBRARY_PATH=/usr/lib - -pkgconf automatically prunes "system library paths" from its output. The -system library paths depend on the system toolchain. A common value on a -64-bit system is as follows: - -/lib64:/usr/lib64:/usr/local/lib64 - -So, if -L/usr/lib64 appears in the Libs section, it will be pruned from -the output of pkg-config --libs. - -The pc files generated for this test contain something like this: - -libdir=/usr/lib -Libs: -L${libdir} ... - -pkgconf may not consider /usr/lib to be a system library path, so it is -not pruned as the test expects. To work around this, override the -compiled-in list of paths via the PKG_CONFIG_SYSTEM_LIBRARY_PATH -environment variable. - -Fixes: https://github.com/mesonbuild/meson/issues/6004 ---- - run_unittests.py | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/run_unittests.py b/run_unittests.py -index 898f05e54d..5a60b9b6a4 100755 ---- a/run_unittests.py -+++ b/run_unittests.py -@@ -4832,7 +4832,10 @@ def test_pkgconfig_gen_deps(self): - privatedir2 = self.privatedir - - os.environ -- env = {'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2])} -+ env = { -+ 'PKG_CONFIG_LIBDIR': os.pathsep.join([privatedir1, privatedir2]), -+ 'PKG_CONFIG_SYSTEM_LIBRARY_PATH': '/usr/lib', -+ } - self._run(['pkg-config', 'dependency-test', '--validate'], override_envvars=env) - - # pkg-config strips some duplicated flags so we have to parse the 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 deleted file mode 100644 index 4ee11829904d..000000000000 --- a/dev-util/meson/files/0.53.1-remove-asan-ld_preload.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 4cc2aead0ba6..000000000000 --- a/dev-util/meson/files/0.53.1-remove-asan.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - |