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 ) id 1Sb6AN-0003NZ-9d for garchives@archives.gentoo.org; Sun, 03 Jun 2012 08:28:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9CACAE06B1; Sun, 3 Jun 2012 08:27:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6934CE06B1 for ; Sun, 3 Jun 2012 08:27:55 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF4581B4014 for ; Sun, 3 Jun 2012 08:27:54 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 921922004B; Sun, 3 Jun 2012 08:27:53 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: multilib.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: multilib.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120603082753.921922004B@flycatcher.gentoo.org> Date: Sun, 3 Jun 2012 08:27:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 6016505f-6e6b-4347-a08f-57d87791861e X-Archives-Hash: d11cc3a3e6e7a7815eeb7c1886d0391a vapier 12/06/03 08:27:53 Modified: multilib.eclass Log: all callers to specify a different set of ABIs with get_all_abis so tha= t we can query the abis for CTARGET with cross-compilers Revision Changes Path 1.98 eclass/multilib.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.ec= lass?rev=3D1.98&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.ec= lass?rev=3D1.98&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib.ec= lass?r1=3D1.97&r2=3D1.98 Index: multilib.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- multilib.eclass 14 Dec 2011 18:15:09 -0000 1.97 +++ multilib.eclass 3 Jun 2012 08:27:53 -0000 1.98 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.97 2011/12= /14 18:15:09 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.98 2012/06= /03 08:27:53 vapier Exp $ =20 # @ECLASS: multilib.eclass # @MAINTAINER: @@ -162,19 +162,26 @@ # Return a list of the ABIs supported by this profile. # the last one in the list being the default. get_all_abis() { - local order=3D"" + local order=3D"" mvar dvar =20 - if [[ -z ${MULTILIB_ABIS} ]] ; then + mvar=3D"MULTILIB_ABIS" + dvar=3D"DEFAULT_ABI" + if [[ -n $1 ]] ; then + mvar=3D"$1_${mvar}" + dvar=3D"$1_${dvar}" + fi + + if [[ -z ${!mvar} ]] ; then echo "default" return 0 fi =20 - for x in ${MULTILIB_ABIS}; do - if [[ ${x} !=3D ${DEFAULT_ABI} ]] ; then + for x in ${!mvar}; do + if [[ ${x} !=3D ${!dvar} ]] ; then order=3D"${order:+${order} }${x}" fi done - order=3D"${order:+${order} }${DEFAULT_ABI}" + order=3D"${order:+${order} }${!dvar}" =20 echo ${order} return 0