From ee0c4d5e506a6c64994a15c3af5cf1ca22045567 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 27 Nov 2023 22:51:10 +0000 Subject: gentoo auto-resync : 27:11:2023 - 22:51:09 --- profiles/arch/amd64/no-multilib/package.use.force | 7 ++++++- profiles/arch/amd64/package.use.force | 6 ++++++ profiles/arch/amd64/x32/package.use.force | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) (limited to 'profiles/arch/amd64') 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 (2023-10-06) +# Undo multilib forcing. +dev-libs/libatomic_ops -abi_x86_32 +dev-libs/boehm-gc -abi_x86_32 + # Michał Górny (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 (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 (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 (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 (2017-04-08) # Require sandbox to be multilib-capable to avoid failures when building # multilib packages, #611292. -- cgit v1.2.3