From b74d16920a09aa6a9bf814add95dfb6539ff22f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 8 Apr 2017 07:41:36 +0200 Subject: [PATCH] profiles/arch/amd64*: force full multilib on sys-apps/sandbox, #611292 --- profiles/arch/amd64-fbsd/package.use.force | 7 ++++++- profiles/arch/amd64/no-multilib/package.use.force | 6 ++++++ profiles/arch/amd64/package.use.force | 7 ++++++- profiles/arch/amd64/x32/package.use.force | 7 +++++++ 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 profiles/arch/amd64/no-multilib/package.use.force create mode 100644 profiles/arch/amd64/x32/package.use.force diff --git a/profiles/arch/amd64-fbsd/package.use.force b/profiles/arch/amd64-fbsd/package.use.force index 8025d872db45..b3a9e1d3fe1b 100644 --- a/profiles/arch/amd64-fbsd/package.use.force +++ b/profiles/arch/amd64-fbsd/package.use.force @@ -1,6 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (08 Apr 2017) +# Require sandbox to be multilib-capable to avoid failures when building +# multilib packages, #611292. +sys-apps/sandbox abi_x86_32 + # Michał Górny (24 Sep 2016) # Force the host target to avoid dependency hell sys-devel/clang llvm_targets_X86 diff --git a/profiles/arch/amd64/no-multilib/package.use.force b/profiles/arch/amd64/no-multilib/package.use.force new file mode 100644 index 000000000000..0f2c76d1c72f --- /dev/null +++ b/profiles/arch/amd64/no-multilib/package.use.force @@ -0,0 +1,6 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny (08 Apr 2017) +# 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 ab5831aebbc8..c267fe03e14d 100644 --- a/profiles/arch/amd64/package.use.force +++ b/profiles/arch/amd64/package.use.force @@ -1,6 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +# Michał Górny (08 Apr 2017) +# Require sandbox to be multilib-capable to avoid failures when building +# multilib packages, #611292. +sys-apps/sandbox abi_x86_32 + # Michał Górny (24 Sep 2016) # Force the host target to avoid dependency hell sys-devel/clang llvm_targets_X86 diff --git a/profiles/arch/amd64/x32/package.use.force b/profiles/arch/amd64/x32/package.use.force new file mode 100644 index 000000000000..104f780e302b --- /dev/null +++ b/profiles/arch/amd64/x32/package.use.force @@ -0,0 +1,7 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# Michał Górny (08 Apr 2017) +# Require sandbox to be multilib-capable to avoid failures when building +# multilib packages, #611292. +sys-apps/sandbox abi_x86_64 -- 2.26.2