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-391473-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RDkiT-0007M6-5k
for garchives@archives.gentoo.org; Tue, 11 Oct 2011 22:22:29 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5E87B21C059;
Tue, 11 Oct 2011 22:22:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 20F8421C059
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 22:22:21 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6B72C1B404F
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 22:22:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id C835680042
for <gentoo-commits@lists.gentoo.org>; Tue, 11 Oct 2011 22:22:19 +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: <48942e883df62a0527d7bf5f64ebaaaf0b5de568.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: 48942e883df62a0527d7bf5f64ebaaaf0b5de568
Date: Tue, 11 Oct 2011 22:22:19 +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:
X-Archives-Hash: b6210ff8c25214d1b034becb6511935f
commit: 48942e883df62a0527d7bf5f64ebaaaf0b5de568
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 21:48:37 2011 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 22:02:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/crossdev.git;=
a=3Dcommit;h=3D48942e88
crossdev: only setup multilib env if requested
We don't want to force systems to always use "/lib/" if they're using a
single ABI. The current code would always forced x86_64 targets in the
case of MULTILIB_ABIS=3Damd64 to only install into /lib/. Undo this logi=
c
so that multilib.eclass can kick in and give us the right paths for the
native (single) ABI that is selected.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
---
crossdev | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/crossdev b/crossdev
index b470cd9..767c580 100755
--- a/crossdev
+++ b/crossdev
@@ -439,7 +439,7 @@ UOPTS=3D
TARCH=3D
HARCH=3D
CTARGET=3D
-MULTILIB_ABIS=3D"default"
+MULTILIB_ABIS=3D""
STAGE=3D""
BCAT=3D"sys-devel" ; BPKG=3D"binutils" ; BVER=3D"" BUSE=3D"" BENV=3D=
"" BOVL=3D""
GCAT=3D"sys-devel" ; GPKG=3D"gcc" ; GVER=3D"" GUSE=3D"" GENV=3D=
"" GOVL=3D""
@@ -555,8 +555,6 @@ for v in MULTILIB_ABIS UCLIBC_CPU USE BVER GVER KVER =
LVER STAGE CFLAGS LDFLAGS A
source "${d}"/env
fi
done
-ABI=3D$(set -- ${MULTILIB_ABIS:-default}; echo $1)
-DEFAULT_ABI=3D${ABI}
=20
#####################
### do the emerge ###
@@ -567,7 +565,7 @@ einfo "Host Portage ARCH: ${HARCH}"
einfo "Target Portage ARCH: ${TARCH}"
einfo "Target System: ${CTARGET}"
einfo "Stage: ${STAGE} (${STAGE_DISP[${STAGE}]})"
-einfo "ABIs: ${MULTILIB_ABIS}"
+einfo "ABIs: ${MULTILIB_ABIS:-<just one: the default>}"
echo
ex_fast || {
is_s0 && {
@@ -688,21 +686,26 @@ set_links() {
ln -s "${srcdir}"/${cat}/${pkg} "${d}"
}
set_env() {
- local pkg=3D$1 env=3D$2
+ local pkg=3D$1 env=3D$2 output
shift ; shift
=20
- cat <<-EOF > env/cross-${CTARGET}/${pkg}
- # handle multilib ourselves
- ABI=3D${ABI}
- MULTILIB_ABIS=3D"${MULTILIB_ABIS}"
- DEFAULT_ABI=3D${DEFAULT_ABI}
- LIBDIR_default=3D"lib"
- CFLAGS_default=3D
- CPPFLAGS_default=3D
- CXXFLAGS_default=3D
- LDFLAGS_default=3D
+ output=3D"env/cross-${CTARGET}/${pkg}"
+ cat <<-EOF > "${output}"
+ SYMLINK_LIB=3Dno
$(printf '%b' "${env}")
EOF
+
+ # allow USE=3D-multilib to work its magic via multilib.eclass
+ # by not setting random values when we simply want one abi
+ if [[ -n ${MULTILIB_ABIS} ]] ; then
+ ABI=3D$(set -- ${MULTILIB_ABIS}; echo $1)
+ cat <<-EOF >> "${output}"
+ # handle multilib ourselves
+ ABI=3D${ABI}
+ MULTILIB_ABIS=3D"${MULTILIB_ABIS}"
+ DEFAULT_ABI=3D${ABI}
+ EOF
+ fi
}
set_portage() {
local cat=3D$1 pkg=3D$2 ver=3D$3 env=3D$4 ovl=3D$5
@@ -814,7 +817,7 @@ doemerge() {
einfo "Log: ${logfile}"
ebegin "Emerging cross-${2:-$1}"
=20
- set_use $1 ${USE} $( [[ ${MULTILIB_ABIS} =3D=3D "default" ]] && echo - =
)multilib
+ set_use $1 ${USE} $( [[ -z ${MULTILIB_ABIS} ]] && echo - )multilib
=20
if [[ ${UOPTS/-v} !=3D ${UOPTS} || ${UOPTS/-p} !=3D ${UOPTS} ]] ; then
emerge cross-${CTARGET}/$1 ${EOPTS} \