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 1R14Xl-00031G-Kd for garchives@archives.gentoo.org; Tue, 06 Sep 2011 22:55:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6A3F21C0AC; Tue, 6 Sep 2011 22:54:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6A5DE21C0AC for ; Tue, 6 Sep 2011 22:54:48 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 954A21B404F for ; Tue, 6 Sep 2011 22:54:47 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 68F222004C; Tue, 6 Sep 2011 22:54:45 +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-funcs.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: toolchain-funcs.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20110906225445.68F222004C@flycatcher.gentoo.org> Date: Tue, 6 Sep 2011 22:54:45 +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: X-Archives-Hash: 4b70cd04d3b319498bb0edcbfbf2e418 vapier 11/09/06 22:54:45 Modified: toolchain-funcs.eclass Log: unify tc-getPROG and tc-getBUILD_CC implementations, and add new tc-get= BUILD_{CPP,CXX} helpers on top of that Revision Changes Path 1.105 eclass/toolchain-funcs.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-f= uncs.eclass?rev=3D1.105&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-f= uncs.eclass?rev=3D1.105&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain-f= uncs.eclass?r1=3D1.104&r2=3D1.105 Index: toolchain-funcs.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-funcs.eclass,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- toolchain-funcs.eclass 12 Jul 2011 14:29:41 -0000 1.104 +++ toolchain-funcs.eclass 6 Sep 2011 22:54:45 -0000 1.105 @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.104= 2011/07/12 14:29:41 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.105= 2011/09/06 22:54:45 vapier Exp $ =20 # @ECLASS: toolchain-funcs.eclass # @MAINTAINER: @@ -18,23 +18,31 @@ =20 DESCRIPTION=3D"Based on the ${ECLASS} eclass" =20 -tc-getPROG() { - local var=3D$1 - local prog=3D$2 - - if [[ -n ${!var} ]] ; then - echo "${!var}" - return 0 - fi +# tc-getPROG [tuple] +_tc-getPROG() { + local tuple=3D$1 + local v var vars=3D$2 + local prog=3D$3 + + var=3D${vars%% *} + for v in ${vars} ; do + if [[ -n ${!v} ]] ; then + export ${var}=3D${!v} + echo "${!v}" + return 0 + fi + done =20 local search=3D - [[ -n $3 ]] && search=3D$(type -p "$3-${prog}") - [[ -z ${search} && -n ${CHOST} ]] && search=3D$(type -p "${CHOST}-${pro= g}") + [[ -n $4 ]] && search=3D$(type -p "$4-${prog}") + [[ -z ${search} && -n ${!tuple} ]] && search=3D$(type -p "${!tuple}-${p= rog}") [[ -n ${search} ]] && prog=3D${search##*/} =20 export ${var}=3D${prog} echo "${!var}" } +tc-getBUILD_PROG() { _tc-getPROG CBUILD "$@"; } +tc-getPROG() { _tc-getPROG CHOST "$@"; } =20 # @FUNCTION: tc-getAR # @USAGE: [toolchain prefix] @@ -104,26 +112,15 @@ # @FUNCTION: tc-getBUILD_CC # @USAGE: [toolchain prefix] # @RETURN: name of the C compiler for building binaries to run on the bu= ild machine -tc-getBUILD_CC() { - local v - for v in CC_FOR_BUILD BUILD_CC HOSTCC ; do - if [[ -n ${!v} ]] ; then - export BUILD_CC=3D${!v} - echo "${!v}" - return 0 - fi - done - - local search=3D - if [[ -n ${CBUILD} ]] ; then - search=3D$(type -p ${CBUILD}-gcc) - search=3D${search##*/} - fi - search=3D${search:-gcc} - - export BUILD_CC=3D${search} - echo "${search}" -} +tc-getBUILD_CC() { tc-getBUILD_PROG "BUILD_CC CC_FOR_BUILD HOSTCC" gcc "= $@"; } +# @FUNCTION: tc-getBUILD_CPP +# @USAGE: [toolchain prefix] +# @RETURN: name of the C preprocessor for building binaries to run on th= e build machine +tc-getBUILD_CPP() { tc-getBUILD_PROG "BUILD_CPP CPP_FOR_BUILD HOSTCPP" c= pp "$@"; } +# @FUNCTION: tc-getBUILD_CXX +# @USAGE: [toolchain prefix] +# @RETURN: name of the C++ compiler for building binaries to run on the = build machine +tc-getBUILD_CXX() { tc-getBUILD_PROG "BUILD_CXX CXX_FOR_BUILD HOSTCXX" g= ++ "$@"; } =20 # @FUNCTION: tc-export # @USAGE: