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-426778-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RxOw6-0003oQ-AF
for garchives@archives.gentoo.org; Tue, 14 Feb 2012 20:25:14 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 45A4BE0ADE;
Tue, 14 Feb 2012 20:24:52 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 1A258E0ADE
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Feb 2012 20:24:52 +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 7F54D1B4023
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Feb 2012 20:24:51 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by hornbill.gentoo.org (Postfix) with ESMTP id 3D68FE5404
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Feb 2012 20:24:50 +0000 (UTC)
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" <vapier@gentoo.org>
Message-ID: <1326260403.60e1d4c0754aead7573f4093eb8b0fb0e235c229.vapier@gentoo>
Subject: [gentoo-commits] proj/crossdev:master commit in: /
X-VCS-Repository: proj/crossdev
X-VCS-Files: crossdev
X-VCS-Directories: /
X-VCS-Committer: vapier
X-VCS-Committer-Name: Mike Frysinger
X-VCS-Revision: 60e1d4c0754aead7573f4093eb8b0fb0e235c229
X-VCS-Branch: master
Date: Tue, 14 Feb 2012 20:24:50 +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: 94ba0105-fa9a-4d7e-be35-9897c5eab64b
X-Archives-Hash: bcd0d0e07aafd7a230aeb01d6b8ce24c
commit: 60e1d4c0754aead7573f4093eb8b0fb0e235c229
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 11 05:40:03 2012 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jan 11 05:40:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;=
a=3Dcommit;h=3D60e1d4c0
crossdev: update package.use.mask for multilib too
In no-multilib profiles, the multilib use flag is masked, so we need
to unmask it if the target toolchain wants it.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
crossdev | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/crossdev b/crossdev
index 9a17aa1..35e2a6b 100755
--- a/crossdev
+++ b/crossdev
@@ -295,7 +295,7 @@ uninstall() {
=20
[[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \
&& rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET}
- for f in categories package.{mask,keywords,use} profile/package.use.for=
ce ; do
+ for f in categories package.{mask,keywords,use} profile/package.use.{fo=
rce,mask} ; do
f=3D"${CONFIGROOT}/${f}"
if [[ -d ${f} ]] ; then
rm -f "${f}"/cross-${CTARGET}
@@ -707,6 +707,12 @@ set_use_force() {
output=3D$(_set_portage_file ${pkg} profile/package.use.force)
echo "cross-${CTARGET}/${pkg} ${use}" >> ${output}
}
+set_use_mask() {
+ local pkg=3D$1 output use=3D${@:2}
+ [[ -z ${use} ]] && return 0
+ output=3D$(_set_portage_file ${pkg} profile/package.use.mask)
+ echo "cross-${CTARGET}/${pkg} ${use}" >> ${output}
+}
set_links() {
local cat=3D$1 pkg=3D$2 ovl=3D$3
local s srcdir=3D${PORTDIR} d
@@ -758,6 +764,7 @@ set_portage() {
set_keywords ${pkg} ${ver}
set_use ${pkg} ${use}
set_use_force ${pkg} -multilib
+ set_use_mask ${pkg} -multilib
set_links ${cat} ${pkg} "${ovl}"
set_env ${pkg} "${env}"
}
@@ -811,7 +818,7 @@ grep -qs "^cross-${CTARGET}$" "${CONFIGROOT}"/categor=
ies \
|| echo cross-${CTARGET} >> "${CONFIGROOT}"/categories
mkdir -p "${CROSSDEV_OVERLAY}"/cross-${CTARGET} || exit 1
cd "${CONFIGROOT}"
-for f in package.{keywords,mask,use} env/cross-${CTARGET} profile/packag=
e.use.force ; do
+for f in package.{keywords,mask,use} env/cross-${CTARGET} profile/packag=
e.use.{force,mask} ; do
[[ -f ${f} ]] && continue
mkdir -p ${f} || exit 1
rm -f ${f}/cross-${CTARGET}