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 1PazAN-0006xL-4s for garchives@archives.gentoo.org; Thu, 06 Jan 2011 23:22:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41A7DE08EF; Thu, 6 Jan 2011 23:22:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id F363AE09C3 for ; Thu, 6 Jan 2011 23:22:39 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 097711B403E for ; Thu, 6 Jan 2011 23:22:39 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2145) id 9827E20051; Thu, 6 Jan 2011 23:22:37 +0000 (UTC) From: "Ryan Hill (dirtyepic)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, dirtyepic@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: dirtyepic X-VCS-Committer-Name: Ryan Hill Content-Type: text/plain; charset=utf8 Message-Id: <20110106232237.9827E20051@flycatcher.gentoo.org> Date: Thu, 6 Jan 2011 23:22:37 +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: d79a6889-5844-4305-babd-cae4e09de0d3 X-Archives-Hash: b7657ede02d4bdc8f4abdb8a3ab1370d dirtyepic 11/01/06 23:22:37 Modified: toolchain.eclass Log: Fix cloog-ppl include paths for upcoming 0.15.10 and clean up graphite = and LTO handing for 4.6. Revision Changes Path 1.445 eclass/toolchain.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.445&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?rev=3D1.445&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.e= class?r1=3D1.444&r2=3D1.445 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.444 retrieving revision 1.445 diff -u -r1.444 -r1.445 --- toolchain.eclass 29 Dec 2010 07:31:43 -0000 1.444 +++ toolchain.eclass 6 Jan 2011 23:22:37 -0000 1.445 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.444 2010/= 12/29 07:31:43 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.445 2011/= 01/06 23:22:37 dirtyepic Exp $ # # Maintainer: Toolchain Ninjas =20 @@ -167,7 +167,7 @@ IUSE+=3D" graphite" [[ -n ${SPECS_VER} ]] && IUSE+=3D" nossp" fi - tc_version_is_at_least "4.5" && IUSE+=3D" lto" + [[ ${GCC_BRANCH_VER} =3D=3D 4.5 ]] && IUSE+=3D" lto" fi fi =20 @@ -1326,20 +1326,29 @@ # users to control this feature in the event they need the support. tc_version_is_at_least "4.3" && confgcc=3D"${confgcc} $(use_enable fixe= d-point)" =20 - # graphite support was added in 4.4, which depends upon external librar= ies - # for optimizations. This option allows users to determine if they wan= t - # these optimizations and libraries pulled in. We disable the version = check - # so we can use >=3Dppl-0.11 - tc_version_is_at_least "4.4" && \ - confgcc=3D"${confgcc} $(use_with graphite ppl) - $(use_with graphite cloog) - --disable-ppl-version-check" - - # lto support was added in 4.5, which depends upon elfutils. This allo= ws - # users to enable that option, and pull in the additional library - tc_version_is_at_least "4.5" && \ - confgcc=3D"${confgcc} $(use_enable lto)" + # Graphite support was added in 4.4, which depends on external librarie= s + # for optimizations. Up to 4.6 we use cloog-ppl (cloog fork with Parma= PPL + # backend). Later versions will use upstream cloog with the ISL backen= d. We + # disable the PPL version check so we can use >=3Dppl-0.11. + if tc_version_is_at_least "4.4"; then + confgcc=3D"${confgcc} $(use_with graphite ppl)" + confgcc=3D"${confgcc} $(use_with graphite cloog)" + if use graphite; then + confgcc=3D"${confgcc} --disable-ppl-version-check" + # this will be removed when cloog-ppl-0.15.10 goes stable + if has_version '>=3Ddev-libs/cloog-ppl-0.15.10'; then + confgcc=3D"${confgcc} --with-cloog-include=3D/usr/include/cloog-ppl" + else + confgcc=3D"${confgcc} --with-cloog-include=3D/usr/include/cloog" + fi + fi + fi =20 + # LTO support was added in 4.5, which depends upon elfutils. This allo= ws + # users to enable that option, and pull in the additional library. In = 4.6, + # the dependency is no longer required. + [[ ${GCC_BRANCH_VER} =3D=3D 4.5 ]] && confgcc=3D"${confgcc} $(use_enabl= e lto)" + [[ ${GCC_BRANCH_VER} > 4.5 ]] && confgcc=3D"${confgcc} --enable-lto" =20 [[ $(tc-is-softfloat) =3D=3D "yes" ]] && confgcc=3D"${confgcc} --with-f= loat=3Dsoft" [[ $(tc-is-hardfloat) =3D=3D "yes" ]] && confgcc=3D"${confgcc} --with-f= loat=3Dhard"