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 1SWhL1-0005YZ-G4 for garchives@archives.gentoo.org; Tue, 22 May 2012 05:08:54 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4ED33E0A72; Tue, 22 May 2012 05:08:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1BCCAE0A72 for ; Tue, 22 May 2012 05:08:33 +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 38ADE1B4044 for ; Tue, 22 May 2012 05:08:31 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id E2F7F2004B; Tue, 22 May 2012 05:08:29 +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: toolchain.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: toolchain.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120522050829.E2F7F2004B@flycatcher.gentoo.org> Date: Tue, 22 May 2012 05:08:29 +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: 91451ed2-179f-46c3-9dfb-5396275a2611 X-Archives-Hash: 10a08717515eddef6fb1d3afde005b6a vapier 12/05/22 05:08:29 Modified: toolchain.eclass Log: drop x32 support for 4.6.x versions now that we have 4.7.0 Revision Changes Path 1.539 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.539&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.539&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?r1=3D1.538&r2=3D1.539 Index: toolchain.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/toolchain.eclass,v retrieving revision 1.538 retrieving revision 1.539 diff -u -r1.538 -r1.539 --- toolchain.eclass 18 May 2012 04:59:55 -0000 1.538 +++ toolchain.eclass 22 May 2012 05:08:29 -0000 1.539 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.538 2012/= 05/18 04:59:55 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.539 2012/= 05/22 05:08:29 vapier Exp $ # # Maintainer: Toolchain Ninjas =20 @@ -842,12 +842,7 @@ if [[ -n ${list} ]] ; then case ${CTARGET} in x86_64*) - # drop the 4.6.2 stuff once 4.7 goes stable - if tc_version_is_at_least 4.7 || - ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) ) - then - confgcc+=3D" --with-multilib-list=3D${list:1}" - fi + tc_version_is_at_least 4.7 && confgcc+=3D" --with-multilib-list=3D${l= ist:1}" ;; esac fi @@ -979,7 +974,7 @@ amd64) # drop the older/ABI checks once this get's merged into some # version of gcc upstream - if [[ ${PV} =3D=3D "4.6.2" ]] && has x32 $(get_all_abis) ; then + if tc_version_is_at_least 4.7 && has x32 $(get_all_abis) ; then confgcc+=3D" --with-abi=3D$(gcc-abi-map ${DEFAULT_ABI})" fi ;; @@ -1925,10 +1920,7 @@ =20 if [[ ${SYMLINK_LIB} =3D=3D "yes" ]] ; then einfo "updating multilib directories to be: ${libdirs}" - # drop the 4.6.2 stuff once 4.7 goes stable - if tc_version_is_at_least 4.7 || - ( tc_version_is_at_least 4.6.2 && has x32 $(get_all_abis) ) - then + if tc_version_is_at_least 4.7 ; then set -- -e '/^MULTILIB_OSDIRNAMES.*lib32/s:[$][(]if.*):../lib32:' else set -- -e "/^MULTILIB_OSDIRNAMES/s:=3D.*:=3D ${libdirs}:"