[gentoo-commits] gentoo-x86 commit in sys-devel/gcc-config/files: gcc-config-1.4.0

[Mike Frysinger (vapier)]

vapier      07/12/27 19:01:07

  Modified:             gcc-config-1.4.0
  Log:
  Fix fallback CHOST detection when python is broken #203387 by Ambroz BIzjak.
  (Portage version: 2.1.4_rc11)

Revision  Changes    Path
1.24                 sys-devel/gcc-config/files/gcc-config-1.4.0

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0?r1=1.23&r2=1.24

Index: gcc-config-1.4.0
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gcc-config-1.4.0	11 Oct 2007 05:27:57 -0000	1.23
+++ gcc-config-1.4.0	27 Dec 2007 19:01:06 -0000	1.24
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.23 2007/10/11 05:27:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.24 2007/12/27 19:01:06 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -54,7 +54,7 @@
 	# First we read make.conf
 	#
 
-	local varname=$1
+	local varname=${1:-CHOST}
 	local conf=${ROOT}/etc/make.conf
 	local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname})
 	if [[ -z ${ret} ]] ; then
@@ -63,7 +63,7 @@
 		ret=$(eval $(
 			sed -n \
 				-e 's:[[:space:]]::g' \
-				-e '/^CHOST=/p' \
+				-e "/^${varname}=/p" \
 				"${conf}"
 			) ; echo ${!varname}
 		)



-- 
gentoo-commits@g.o mailing list