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 1S1gxD-0005Vd-1h for garchives@archives.gentoo.org; Sun, 26 Feb 2012 16:28:07 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FCB9E1240; Sun, 26 Feb 2012 16:27:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1215FE123D for ; Sun, 26 Feb 2012 16:27:24 +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 6D1C31B4011 for ; Sun, 26 Feb 2012 16:27:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 33C79E5417 for ; Sun, 26 Feb 2012 16:27:17 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1330270192.909addf96cca3fe5de77e96f47f7d8b9233bac57.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/auto-multilib.sh X-VCS-Directories: bin/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 909addf96cca3fe5de77e96f47f7d8b9233bac57 X-VCS-Branch: multilib Date: Sun, 26 Feb 2012 16:27:17 +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: ac5861de-767c-4fd1-b27a-19277627986d X-Archives-Hash: 60dbf72db3d8d378c1940b5d11832c70 commit: 909addf96cca3fe5de77e96f47f7d8b9233bac57 Author: Thomas Sachau gentoo org> AuthorDate: Sun Feb 26 15:29:52 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sun Feb 26 15:29:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D909addf9 auto-multilib.sh: Move multilib behind force-multilib FEATURE --- bin/auto-multilib.sh | 52 ++++++++++++++++++++++++++++----------------= ----- 1 files changed, 30 insertions(+), 22 deletions(-) diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh index db49c52..d9c68e8 100755 --- a/bin/auto-multilib.sh +++ b/bin/auto-multilib.sh @@ -114,34 +114,42 @@ is_ebuild() { } =20 get_abi_order() { - local order=3D - use multilib_abi_"${DEFAULT_ABI}" && order=3D${DEFAULT_ABI} + if [[ " ${FEATURES} " =3D=3D *" force-multilib "* ]]; then + local order=3D + use multilib_abi_"${DEFAULT_ABI}" && order=3D${DEFAULT_ABI} =20 - if is_auto-multilib; then - for x in ${MULTILIB_ABIS/${DEFAULT_ABI}} ; do - use multilib_abi_"${x}" && order+=3D" ${x}" - done - fi + if is_auto-multilib; then + for x in ${MULTILIB_ABIS/${DEFAULT_ABI}} ; do + use multilib_abi_"${x}" && order+=3D" ${x}" + done + fi =20 - if [ -z "${order}" ]; then - if ! [ -z "${DEFAULT_ABI}" ]; then - order=3D${DEFAULT_ABI} - else - die "Could not determine your profile ABI(s). Perhaps your USE flags= or MULTILIB_ABIS are too restrictive for this package or your profile do= es not set DEFAULT_ABI." + if [ -z "${order}" ]; then + if ! [ -z "${DEFAULT_ABI}" ]; then + order=3D${DEFAULT_ABI} + else + die "Could not determine your profile ABI(s). Perhaps your USE flag= s or MULTILIB_ABIS are too restrictive for this package or your profile d= oes not set DEFAULT_ABI." + fi fi - fi =20 - echo ${order} + echo ${order} + else + echo "default" + fi } =20 get_abi_list() { - if ! is_ebuild; then - for my_abi in $(get_abi_order); do - [[ -e "${D%/}".${my_abi} ]] || break - done - fi + if [[ " ${FEATURES} " =3D=3D *" force-multilib "* ]]; then + if ! is_ebuild; then + for my_abi in $(get_abi_order); do + [[ -e "${D%/}".${my_abi} ]] || break + done + fi =20 - is_ebuild && echo $(get_abi_order) || echo ${my_abi} + is_ebuild && echo $(get_abi_order) || echo ${my_abi} + else + echo "default" + fi } =20 set_abi() { @@ -215,9 +223,9 @@ unset_abi() { } =20 _get_abi_string() { - if is_auto-multilib && [ -n "${ABI}" ]; then + [[ " ${FEATURES} " =3D=3D *" force-multilib "* ]] && \ + is_auto-multilib && [ -n "${ABI}" ] && \ echo " (for ABI=3D${ABI})" - fi } =20 _setup_abi_env() {