move to binutils-config behavior where all env.d files have a -${CTARGET} postfix

Package-Manager: portage-2.1.3_rc9

2 files changed, 24 insertions, 22 deletions

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index f5102e053559..e892804d03a3 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -17,10 +17,10 @@ AUX gcc-config-1.3.16 19744 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae SHA1
 MD5 5fc3469999611894758a1b9c2365b719 files/gcc-config-1.3.16 19744
 RMD160 c48c1137113100e6fdc08a666638ac56eb60ebae files/gcc-config-1.3.16 19744
 SHA256 c4c3ada7597b7a8610873ff2b45b0137264821df870a1700fd278727c72e3717 files/gcc-config-1.3.16 19744
-AUX gcc-config-1.4.0 19618 RMD160 336d69c1a25803546898500134fb29ce529c21e0 SHA1 0f86745e3c4055bf02cbf0c11bcfd2952c15ea40 SHA256 de282569cfa05ec2ab2bd9d0a6890f1aceb4ca8904106d789e9e555858232ac6
-MD5 b9bc759abce2fac7861a358a8cbd4e85 files/gcc-config-1.4.0 19618
-RMD160 336d69c1a25803546898500134fb29ce529c21e0 files/gcc-config-1.4.0 19618
-SHA256 de282569cfa05ec2ab2bd9d0a6890f1aceb4ca8904106d789e9e555858232ac6 files/gcc-config-1.4.0 19618
+AUX gcc-config-1.4.0 19742 RMD160 e72f4f33fcbd00e442be71bccde6ab660165decb SHA1 7fd242d28763acb5986c7bc2b8c263aa3ac7ba63 SHA256 b42a0372d6e6ce410c90162e0f1c6aff150931bcb44c507541072fd2b41549c1
+MD5 3776936a2dc2c090ccf66dfdda960162 files/gcc-config-1.4.0 19742
+RMD160 e72f4f33fcbd00e442be71bccde6ab660165decb files/gcc-config-1.4.0 19742
+SHA256 b42a0372d6e6ce410c90162e0f1c6aff150931bcb44c507541072fd2b41549c1 files/gcc-config-1.4.0 19742
 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
@@ -85,9 +85,9 @@ MD5 63440bc21fdf46cc94352893f2fd6e3e files/digest-gcc-config-2.0.0_rc1 277
 RMD160 3b08c6248c4f7f8d14ac66ff0fb70bb8c8276c53 files/digest-gcc-config-2.0.0_rc1 277
 SHA256 ba21ae92f613fd0a6f34b3fda34d1d82c6b284c045481b9686b66fd9e373c21e files/digest-gcc-config-2.0.0_rc1 277
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGfrUEppoStNGKGywRAovjAKCLkJXF94apdY7Z6hF317Tpaga5hwCdG9Fx
-YhL/kklLDqGzBY6lt4DorS0=
-=1lU0
+iD8DBQFGp1iWp/wUKkr7RBoRAtKnAKCBaVlWz916eQrDLpkswozWRKdBvQCg4FYw
++UXplgjVDazyOVC9NJkt4Xs=
+=AvAL
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.4.0 b/sys-devel/gcc-config/files/gcc-config-1.4.0
index c55c7a9ab0b4..73bd4bc62e43 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.4.0
+++ b/sys-devel/gcc-config/files/gcc-config-1.4.0
@@ -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.16 2007/05/15 00:47:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.4.0,v 1.17 2007/07/25 14:03:56 vapier Exp $
 
 trap ":" INT QUIT TSTP
 
@@ -220,13 +220,13 @@ switch_profile() {
 	else
 		# Pass all by default
 		awk '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS|GCC_PATH)=/ {print $0}' \
-			"${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc"
-		echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_D}/05gcc"
-		echo "PATH=\"${GCC_PATH}\"" >> "${ENV_D}/05gcc"
-		echo "ROOTPATH=\"${GCC_PATH}\"" >> "${ENV_D}/05gcc"
+			"${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc-${CTARGET}"
+		echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_D}/05gcc-${CTARGET}"
+		echo "PATH=\"${GCC_PATH}\"" >> "${ENV_D}/05gcc-${CTARGET}"
+		echo "ROOTPATH=\"${GCC_PATH}\"" >> "${ENV_D}/05gcc-${CTARGET}"
 		if [[ -n ${GCC_SPECS} ]] ; then
 			if files_exist ${MY_LDPATH} ${GCC_SPECS} ; then
-				echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc"
+				echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc-${CTARGET}"
 			else
 				echo
 				ewarn "Your GCC spec configurations are broken."
@@ -237,7 +237,7 @@ switch_profile() {
 			# People need to rebuild their gcc or setting GCC_SPECS to
 			# "" will cause issues again :(
 			if [[ ${ROOT} != "/" ]] ; then
-				echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+				echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc-${CTARGET}"
 			else
 				if ! GCC_SPECS="" /usr/bin/gcc -v &>/dev/null ; then
 					echo
@@ -246,12 +246,16 @@ switch_profile() {
 					ewarn "http://bugs.gentoo.org/68395"
 					echo
 				else
-					echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+					echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc-${CTARGET}"
 				fi
 			fi
 		fi
 
-		echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config"
+		echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config-${CTARGET}"
+
+		# Punt old files
+		rm -f "${ENV_D}/05gcc"
+		rm -f "${GCC_ENV_D}/config"
 	fi
 
 	# Find the bin wrapper
@@ -347,7 +351,7 @@ switch_profile() {
 			ewarn "env-update failed to work properly; making sure ld.so.conf paths"
 			ewarn "are setup properly.  Please rerun gcc-config with the -f option."
 			echo ""
-			grep -h ^LDPATH= "${ROOT}"/etc/env.d/05gcc \
+			grep -h ^LDPATH= "${ROOT}"/etc/env.d/05gcc-${CTARGET} \
 				| sed -e 's:^LDPATH=::' -e 's:"::g' -e 's|:|\n|g' \
 				>> /etc/ld.so.conf
 			ldconfig
@@ -369,10 +373,8 @@ switch_profile() {
 }
 
 get_current_profile() {
-	local conf="${GCC_ENV_D}/config"
-	if [[ -n ${CTARGET} ]] ; then
-		conf="${conf}-${CTARGET}"
-	elif [[ -n ${CC_COMP} ]] && is_cross_compiler ; then
+	local conf="${GCC_ENV_D}/config-${CTARGET}"
+	if [[ -n ${CC_COMP} ]] && is_cross_compiler ; then
 		conf="${conf}-${CC_COMP}"
 	fi