commit: 44d46e2703d097c49ebfeb48ce753936734d5f66 Author: Violet Purcell <vimproved <AT> inventati <DOT> org> AuthorDate: Wed Jun 19 04:07:30 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 20 17:42:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d46e27
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 <AT> inventati.org> Closes: https://github.com/gentoo/gentoo/pull/37212 Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/default/linux/arm/23.0/musl/package.use.stable.mask | 5 +++++ profiles/default/linux/ppc/23.0/musl/package.use.mask | 7 ++++++- profiles/default/linux/x86/23.0/i486/musl/package.use.mask | 6 +++++- profiles/default/linux/x86/23.0/i686/musl/package.use.mask | 5 +++++ profiles/features/musl/package.use.mask | 5 ----- 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/profiles/default/linux/arm/23.0/musl/package.use.stable.mask b/profiles/default/linux/arm/23.0/musl/package.use.stable.mask index c021f45d8508..785b52ceb864 100644 --- a/profiles/default/linux/arm/23.0/musl/package.use.stable.mask +++ b/profiles/default/linux/arm/23.0/musl/package.use.stable.mask @@ -1,6 +1,11 @@ # Copyright 2024 Gentoo Authors # Distributed under the terms of the GNU General Public License, v2 +# Sam James <[email protected]> (2024-06-16) +# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build +# See bug #928936. +sys-devel/clang-runtime sanitize + # Andreas K. Hüttel <[email protected]> (2024-03-20) # Does not compile with musl-1.2.4 sys-devel/gcc sanitize diff --git a/profiles/default/linux/ppc/23.0/musl/package.use.mask b/profiles/default/linux/ppc/23.0/musl/package.use.mask index 80fbaf3654a7..c7d54156ade0 100644 --- a/profiles/default/linux/ppc/23.0/musl/package.use.mask +++ b/profiles/default/linux/ppc/23.0/musl/package.use.mask @@ -1,6 +1,11 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James <[email protected]> (2024-06-16) +# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build +# See bug #928936. +sys-devel/clang-runtime sanitize + # Sam James <[email protected]> (2023-01-29) # Fails to build on combination of ppc* + musl because of mcontext. # libsanitizer needs adapting, bug #892079. 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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (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 <[email protected]> (2024-05-20) # Does not compile with musl-1.2.4+ sys-devel/gcc sanitize diff --git a/profiles/features/musl/package.use.mask b/profiles/features/musl/package.use.mask index d20c7dd9c843..9cb4b9e5ab7b 100644 --- a/profiles/features/musl/package.use.mask +++ b/profiles/features/musl/package.use.mask @@ -1,11 +1,6 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Sam james <[email protected]> (2024-06-16) -# Avoid pulling in sys-libs/compiler-rt-sanitizers which fails to build -# See bug #928936. -sys-devel/clang-runtime sanitize - # Sam James <[email protected]> (2024-06-03) # Poor rendering performance otherwise (bug #931215) but it doesn't # work on musl.
