summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViolet Purcell <vimproved@inventati.org>2024-06-19 00:07:30 -0400
committerSam James <sam@gentoo.org>2024-06-20 18:42:16 +0100
commit44d46e2703d097c49ebfeb48ce753936734d5f66 (patch)
treee6bd0c3909d0f93748023a0a2b40932900026b7b /profiles/default/linux/x86
parentdev-java/j2objc-annotations: Stabilize 3.0.0-r1 arm64, #934613 (diff)
downloadgentoo-44d46e2703d097c49ebfeb48ce753936734d5f66.tar.gz
gentoo-44d46e2703d097c49ebfeb48ce753936734d5f66.tar.bz2
gentoo-44d46e2703d097c49ebfeb48ce753936734d5f66.zip
profiles: only mask clang-runtime[sanitize] on 32-bit musl profiles
The issue in the bug is only an issue on 32-bit musl platforms, not on 64-bit. The original mask was overzealous, narrow the mask to arm, ppc, and x86. Bug: https://bugs.gentoo.org/928936 Signed-off-by: Violet Purcell <vimproved@inventati.org> Closes: https://github.com/gentoo/gentoo/pull/37212 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'profiles/default/linux/x86')
-rw-r--r--profiles/default/linux/x86/23.0/i486/musl/package.use.mask6
-rw-r--r--profiles/default/linux/x86/23.0/i686/musl/package.use.mask5
2 files changed, 10 insertions, 1 deletions
diff --git a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
index 3ced25c30235..0f0f54b0e2d2 100644
--- a/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i486/musl/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2
+# Sam James <sam@gentoo.org> (2024-06-16)
+# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build
+# See bug #928936.
+sys-devel/clang-runtime sanitize
+
# Ian Jordan <immoloism@gmail.com> (2024-05-20)
# Does not compile with musl-1.2.4+
sys-devel/gcc sanitize
@@ -10,4 +15,3 @@ sys-devel/gcc sanitize
# file-5.39-seccomp_sandbox.patch is okay
# file-5.39-portage_sandbox.patch is broken
sys-apps/file seccomp
-
diff --git a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
index d3fa26567c1d..0f0f54b0e2d2 100644
--- a/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
+++ b/profiles/default/linux/x86/23.0/i686/musl/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License, v2
+# Sam James <sam@gentoo.org> (2024-06-16)
+# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build
+# See bug #928936.
+sys-devel/clang-runtime sanitize
+
# Ian Jordan <immoloism@gmail.com> (2024-05-20)
# Does not compile with musl-1.2.4+
sys-devel/gcc sanitize