commit: 1a96b82a76b8d7fb824d4a7b47f6b70c1808936c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Oct 6 15:49:32 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Nov 26 23:36:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a96b82a
profiles/arch: Force multilib flags on sys-devel/gcc deps Force enabling respective abi_* flags on sys-devel/gcc dependencies in profiles where multiple MULTILIB_ABIS are used by default. This prevents sys-devel/gcc build from failing late in the build with cryptic error messages when USE=multilib (that is forced on) is used along with USE=objc. Bug: https://bugs.gentoo.org/617788 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/33216 Signed-off-by: Sam James <sam <AT> gentoo.org> profiles/arch/amd64/no-multilib/package.use.force | 7 ++++++- profiles/arch/amd64/package.use.force | 6 ++++++ profiles/arch/amd64/x32/package.use.force | 6 ++++++ profiles/arch/mips/mips64/multilib/package.use.force | 8 ++++++++ profiles/arch/mips/mipsel/mips64el/multilib/package.use.force | 8 ++++++++ 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/profiles/arch/amd64/no-multilib/package.use.force b/profiles/arch/amd64/no-multilib/package.use.force index 17acf1185e81..2897c534ec47 100644 --- a/profiles/arch/amd64/no-multilib/package.use.force +++ b/profiles/arch/amd64/no-multilib/package.use.force @@ -1,6 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michał Górny <[email protected]> (2023-10-06) +# Undo multilib forcing. +dev-libs/libatomic_ops -abi_x86_32 +dev-libs/boehm-gc -abi_x86_32 + # Michał Górny <[email protected]> (2017-04-08) # Undo multilib forcing. sys-apps/sandbox -abi_x86_32 diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force index da0808237ad6..5c9f06cdb0c4 100644 --- a/profiles/arch/amd64/package.use.force +++ b/profiles/arch/amd64/package.use.force @@ -1,6 +1,12 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michał Górny <[email protected]> (2023-10-06) +# Require ABIs matching MULTILIB_ABIS in gcc dependencies -- otherwise +# sys-devel/gcc[multilib] (which is forced) will fail late in build. +dev-libs/libatomic_ops abi_x86_32 +dev-libs/boehm-gc abi_x86_32 + # Michał Górny <[email protected]> (2017-12-30) # We have ready-to-use configs here. sys-kernel/gentoo-kernel -savedconfig diff --git a/profiles/arch/amd64/x32/package.use.force b/profiles/arch/amd64/x32/package.use.force index 388c2861e5f2..c414ca9911c3 100644 --- a/profiles/arch/amd64/x32/package.use.force +++ b/profiles/arch/amd64/x32/package.use.force @@ -1,6 +1,12 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Michał Górny <[email protected]> (2023-10-06) +# Require ABIs matching MULTILIB_ABIS in gcc dependencies -- otherwise +# sys-devel/gcc[multilib] (which is forced) will fail late in build. +dev-libs/libatomic_ops abi_x86_64 +dev-libs/boehm-gc abi_x86_64 + # Michał Górny <[email protected]> (2017-04-08) # Require sandbox to be multilib-capable to avoid failures when building # multilib packages, #611292. diff --git a/profiles/arch/mips/mips64/multilib/package.use.force b/profiles/arch/mips/mips64/multilib/package.use.force new file mode 100644 index 000000000000..b400461470d5 --- /dev/null +++ b/profiles/arch/mips/mips64/multilib/package.use.force @@ -0,0 +1,8 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny <[email protected]> (2023-10-06) +# Require ABIs matching MULTILIB_ABIS in gcc dependencies -- otherwise +# sys-devel/gcc[multilib] (which is forced) will fail late in build. +dev-libs/libatomic_ops abi_mips_n32 abi_mips_n64 abi_mips_o32 +dev-libs/boehm-gc abi_mips_n32 abi_mips_n64 abi_mips_o32 diff --git a/profiles/arch/mips/mipsel/mips64el/multilib/package.use.force b/profiles/arch/mips/mipsel/mips64el/multilib/package.use.force new file mode 100644 index 000000000000..b400461470d5 --- /dev/null +++ b/profiles/arch/mips/mipsel/mips64el/multilib/package.use.force @@ -0,0 +1,8 @@ +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny <[email protected]> (2023-10-06) +# Require ABIs matching MULTILIB_ABIS in gcc dependencies -- otherwise +# sys-devel/gcc[multilib] (which is forced) will fail late in build. +dev-libs/libatomic_ops abi_mips_n32 abi_mips_n64 abi_mips_o32 +dev-libs/boehm-gc abi_mips_n32 abi_mips_n64 abi_mips_o32
