diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-03-21 13:49:02 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-21 13:49:02 +0000 |
| commit | 8544e7739fedbd7686983c7bafa2d8497046e215 (patch) | |
| tree | 1688446810f2dba7fe8e949652e46e23aafeb74e /sys-devel | |
| parent | Version bump for app-crypt/qca wrt bug 359717. (diff) | |
| download | gentoo-2-8544e7739fedbd7686983c7bafa2d8497046e215.tar.gz gentoo-2-8544e7739fedbd7686983c7bafa2d8497046e215.tar.bz2 gentoo-2-8544e7739fedbd7686983c7bafa2d8497046e215.zip | |
Default to /etc/portage/make.conf #338032 by Dennis Schridde.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc-config/ChangeLog | 5 | ||||
| -rwxr-xr-x | sys-devel/gcc-config/files/gcc-config-1.5 | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog index 8dc3d9d7b62a..255768c4b877 100644 --- a/sys-devel/gcc-config/ChangeLog +++ b/sys-devel/gcc-config/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-devel/gcc-config # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.191 2011/03/18 19:47:37 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.192 2011/03/21 13:49:02 vapier Exp $ + + 21 Mar 2011; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.5: + Default to /etc/portage/make.conf #338032 by Dennis Schridde. *gcc-config-1.5-r1 (18 Mar 2011) diff --git a/sys-devel/gcc-config/files/gcc-config-1.5 b/sys-devel/gcc-config/files/gcc-config-1.5 index badbf4352abe..46e7b5c1511d 100755 --- a/sys-devel/gcc-config/files/gcc-config-1.5 +++ b/sys-devel/gcc-config/files/gcc-config-1.5 @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2011 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.5,v 1.4 2011/03/07 12:48:15 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5,v 1.5 2011/03/21 13:49:02 vapier Exp $ # Format of /etc/env.d/gcc/: # config-TARGET: CURRENT=version for TARGET @@ -47,7 +47,7 @@ Options: -O, --use-old Use the old profile if one was selected. -f, --force Make sure all config files are regenerated. -P, --use-portage-chost Only set to given profile if its CHOST is the - same as that set for portage in /etc/make.conf + same as that set in /etc/portage/make.conf (or one of other portage config files...). -c, --get-current-profile Print current used gcc profile. -l, --list-profiles Print a list of available profiles. @@ -84,7 +84,10 @@ try_real_hard_to_find_CHOST() { # local varname=${1:-CHOST} - local conf=${ROOT}/etc/make.conf + local conf=${ROOT}/etc/portage/make.conf + if [[ ! -e ${conf} && -e ${ROOT}/etc/make.conf ]] ; then + conf=${ROOT}/etc/make.conf + fi local ret=$(source "${conf}" 2>/dev/null ; echo ${!varname}) if [[ -z ${ret} ]] ; then # newer portage supports spaces between the var and = @@ -132,7 +135,7 @@ get_real_chost() { if [[ -z ${REAL_CHOST} ]] ; then eerror "${argv0}: Could not get portage CHOST!" eerror "${argv0}: You should verify that CHOST is set in one of these places:" - eerror "${argv0}: - ${ROOT}/etc/make.conf" + eerror "${argv0}: - ${ROOT}/etc/portage/make.conf" eerror "${argv0}: - active environment" exit 1 fi @@ -618,9 +621,9 @@ for x in "$@" ; do rcsfile="$RCSfile: gcc-config-1.5,v $" rcsfile=${rcsfile#: } rcsfile=${rcsfile%,v*} - cvsrev="$Revision: 1.4 $" + cvsrev="$Revision: 1.5 $" cvsrev=${cvsrev#: } - cvsdate="$Date: 2011/03/07 12:48:15 $" + cvsdate="$Date: 2011/03/21 13:49:02 $" cvsdate=${cvsdate#: } echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})" exit 0 |