summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-07-05 23:36:31 +0000
committerMike Frysinger <vapier@gentoo.org>2006-07-05 23:36:31 +0000
commit11a31613053fcc335ee4783390b0be83d22cd70f (patch)
tree10415285c8074844ad927dc1a238710cda836f18
parentFix build when configure is regenerated using autoconf-2.60 by (diff)
downloadhistorical-11a31613053fcc335ee4783390b0be83d22cd70f.tar.gz
historical-11a31613053fcc335ee4783390b0be83d22cd70f.tar.bz2
historical-11a31613053fcc335ee4783390b0be83d22cd70f.zip
setup command envvars very early so we dont have to do stupid checks in sub code
Package-Manager: portage-2.1.1_pre2-r2
-rw-r--r--sys-devel/gcc-config/Manifest14
-rwxr-xr-xsys-devel/gcc-config/files/gcc-config-1.3.1310
2 files changed, 12 insertions, 12 deletions
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 89c0903e9924..0bb4e88544d3 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX gcc-config-1.3.13 18483 RMD160 c360d43df4d0a5e7d0bf1b502f3b76385bc7272b SHA1 6067722b312acbb5aef582d0628e01549320d84a SHA256 006768d1b374360a38dff7db1b5e570dedf3d1e30a23c24299f2839f7194cd7a
-MD5 8d2478b98cda7b0f5db828224dbd157e files/gcc-config-1.3.13 18483
-RMD160 c360d43df4d0a5e7d0bf1b502f3b76385bc7272b files/gcc-config-1.3.13 18483
-SHA256 006768d1b374360a38dff7db1b5e570dedf3d1e30a23c24299f2839f7194cd7a files/gcc-config-1.3.13 18483
+AUX gcc-config-1.3.13 18473 RMD160 fb0a184e4e18a08b41c34f39539ab4307babeaff SHA1 db6b4942ecf911f66524a4909303cc99bf57bdd3 SHA256 61cde0177a29e504a7f7d3ecc3b5430a6a74fb90dbe5f4f78118db11d277c505
+MD5 28c72a8525b931dd4ae3168b4f5e552b files/gcc-config-1.3.13 18473
+RMD160 fb0a184e4e18a08b41c34f39539ab4307babeaff files/gcc-config-1.3.13 18473
+SHA256 61cde0177a29e504a7f7d3ecc3b5430a6a74fb90dbe5f4f78118db11d277c505 files/gcc-config-1.3.13 18473
AUX wrapper-1.4.7.c 9837 RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 SHA1 4aee9df408a84b22b4007bc9b74543dd8a6f4fc8 SHA256 f462c49721d291ce3b91c46e5fb8e567d6344f0e359e788301bac07065987744
MD5 1b19cf481e2777dff9722f36698c3b24 files/wrapper-1.4.7.c 9837
RMD160 e4feac8cd8746ad7036ec32ff09f1b02d7eceaf8 files/wrapper-1.4.7.c 9837
@@ -35,7 +35,7 @@ SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.4 (GNU/Linux)
-iD8DBQFEqr02amhnQswr0vIRArVwAKCuhnLIJV/j+WE8xGLNUEO8t3+cvQCfYBTx
-2RfIbkS7kx3mld8JVvXtLY0=
-=EVNu
+iD8DBQFErE0VamhnQswr0vIRAouQAJ0Vz6311vhNoGxwpxedt1pSe/4k6gCgmu2t
+Y36xp2STAOS9IT77KJeqkpM=
+=cgPk
-----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.13 b/sys-devel/gcc-config/files/gcc-config-1.3.13
index eac9d35becbe..b123958ad9c1 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.13
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.13
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2006 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.3.13,v 1.10 2006/07/04 19:10:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.13,v 1.11 2006/07/05 23:36:31 vapier Exp $
trap ":" INT QUIT TSTP
@@ -94,7 +94,7 @@ try_real_hard_to_find_CHOST() {
# newer portage supports spaces between the var and =
# CHOST = "this-is-retarded"
ret=$(eval $(
- ${SED:-sed} -n \
+ ${SED} -n \
-e 's:[[:space:]]::g' \
-e '/^CHOST=/p' \
"${conf}"
@@ -494,7 +494,7 @@ split_gcc_ver() {
# target [1]
# accept everything we have left
#
- echo "$@" | ${AWK:-awk} -F- '
+ echo "$@" | ${AWK} -F- '
function pushit(onme, pushee) {
return (onme == "" ? pushee : pushee"-"onme);
}
@@ -534,6 +534,8 @@ chop_gcc_ver_spec() {
echo ${splitTED/ /-} # ver-spec
}
+cmd_setup
+
NEED_ACTION="yes"
DOIT="switch_profile"
CHECK_CHOST="no"
@@ -663,8 +665,6 @@ if [[ ${DOIT} == "switch_profile" ]] && [[ -z ${CC_COMP} ]] ; then
usage 1
fi
-cmd_setup
-
if [[ -z ${CC_COMP} ]] ; then
CC_COMP=$(get_current_profile)
if [[ $? -ne 0 ]] ; then