From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-441878-garchives=archives.gentoo.org@lists.gentoo.org>) id 1SBVxp-0005UX-EJ for garchives@archives.gentoo.org; Sat, 24 Mar 2012 18:45:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF86DE064A; Sat, 24 Mar 2012 18:45:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7EB46E064A for <gentoo-commits@lists.gentoo.org>; Sat, 24 Mar 2012 18:45:10 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD6131B402F for <gentoo-commits@lists.gentoo.org>; Sat, 24 Mar 2012 18:45:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9E51AE5403 for <gentoo-commits@lists.gentoo.org>; Sat, 24 Mar 2012 18:45:08 +0000 (UTC) From: "Nathan Phillip Brink" <binki@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nathan Phillip Brink" <binki@gentoo.org> Message-ID: <1332614603.70bdc824138fe4b81cb64a0ae6277a533b490c10.binki@gentoo> Subject: [gentoo-commits] proj/multilib-portage:master commit in: profiles/base/ X-VCS-Repository: proj/multilib-portage X-VCS-Files: profiles/base/package.use.force profiles/base/package.use.mask profiles/base/use.mask X-VCS-Directories: profiles/base/ X-VCS-Committer: binki X-VCS-Committer-Name: Nathan Phillip Brink X-VCS-Revision: 70bdc824138fe4b81cb64a0ae6277a533b490c10 X-VCS-Branch: master Date: Sat, 24 Mar 2012 18:45:08 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b00aaf3a-fe16-4ec2-be9d-0ba58db1786f X-Archives-Hash: b9f8c1b70bd02250b2f23f9118159349 commit: 70bdc824138fe4b81cb64a0ae6277a533b490c10 Author: Nathan Phillip Brink <binki <AT> gentoo <DOT> org> AuthorDate: Sat Mar 24 18:43:23 2012 +0000 Commit: Nathan Phillip Brink <binki <AT> gentoo <DOT> org> CommitDate: Sat Mar 24 18:43:23 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/multilib-port= age.git;a=3Dcommit;h=3D70bdc824 Disable the multilib useflag for everything except sys-devel/gcc and sys-= libs/glibc. portage-mulitlib's setting of CFLAGS interferes with multilib.eclass:multilib_toolchain_setup(), ex. bug #395619. For most ebuilds, portage-multilib's own ABI looping is preferred to the ebuild's internal ABI looping. However, ebuilds like gcc, glibc, and valgrind must handle multilib on their own due to their dependence on arch details. --- profiles/base/package.use.force | 6 ++++++ profiles/base/package.use.mask | 7 +++++++ profiles/base/use.mask | 6 ++++++ 3 files changed, 19 insertions(+), 0 deletions(-) diff --git a/profiles/base/package.use.force b/profiles/base/package.use.= force index 79e7c43..37e0c31 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,3 +1,9 @@ # Nathan Phillip Brink <binki@gentoo.org> (12 Mar 2012) # The old (SLOT=3D0, 0.97) version of GRUB is 32-bit only sys-boot/grub:0 multilib_abi_x86 + +# Nathan Phillip Brink <binki@gentoo.org> (24 Mar 2012) +# Enable the internal multilib support for these packages, as they +# need to handle building themselves as multilib. +sys-devel/gcc multilib +sys-libs/glibc multilib diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.m= ask index ba81d6f..756bb09 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,3 +1,10 @@ # Nathan Phillip Brink <binki@gentoo.org> (12 Mar 2012) # The old (SLOT=3D0, 0.97) version of GRUB is 32-bit only. sys-boot/grub:0 multilib_abi_amd64 multilib_abi_x32 + +# Nathan Phillip Brink <binki@gentoo.org> (24 Mar 2012) +# Enable the internal multilib support for these packages, as they +# need to handle building themselves as multilib. These particular +# lines except the use.mask file's mask on the multilib useflag. +sys-devel/gcc -multilib +sys-libs/glibc -multilib diff --git a/profiles/base/use.mask b/profiles/base/use.mask new file mode 100644 index 0000000..85221b9 --- /dev/null +++ b/profiles/base/use.mask @@ -0,0 +1,6 @@ +# Nathan Phillip Brink <binki@gentoo.org> (24 Mar 2012) +# Disable ebuilds' internal multilib logic, let portage-multilib do +# the looping through ABIs for the package. This avoids errors where +# portage-multilib's CFLAGS=3D-m64 interferes with +# multilib.eclass:multilib_toolchain_setup() such as bug #395619 +multilib