Also support linker switching for current profile, and add some helpful user output so they can see what is going on.

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

3 files changed, 15 insertions, 9 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index 3eade60c272b..f127733764ed 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/binutils-config
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.45 2011/08/12 20:26:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.46 2011/08/12 20:30:20 vapier Exp $
+
+  12 Aug 2011; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3:
+  Also support linker switching for current profile, and add some helpful user
+  output so they can see what is going on.
 
 *binutils-config-3 (12 Aug 2011)
 
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index a0c94e72cccb..0facb97058be 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -3,17 +3,17 @@ Hash: SHA256
 
 AUX binutils-config-1.9 11043 RMD160 6f7f95d0c4719d747acb939441e9247e9705d98d SHA1 2f801cb2f4bf167207407d0a3e6481e01a1317b8 SHA256 20becd27cd1161d3afcd079ebff883b8eba3e698171937d82a9575dfa19a2373
 AUX binutils-config-2 11440 RMD160 fdb4906f1a9d0fc3f18d450583ce7a5bd72f6068 SHA1 38d11d772da3aeef242d3c67d8b41e2e71d8544b SHA256 5e923d1445910b9b9d1e455e52313087098689359846db0dc3fa52d33b63b192
-AUX binutils-config-3 12789 RMD160 f8985fea59332d698a57a4d1c3fc11788823ef75 SHA1 6ecba494122aa2dcfe465a07e4daa8d3bfdc9cbe SHA256 6973dc67f6b6c9bb8702b456e33c20c161a657bf85967735dbbb6977904a9a5d
+AUX binutils-config-3 12894 RMD160 0741e2827a3df0cbed8f77ea67db90e7e4516b1e SHA1 cae96a0f44fb9f669100ff34f08191c6aad43c34 SHA256 a20d432fdab9f290028dc26931e0ee8757d5f671338f4b5147cc5ce964cefc22
 AUX binutils-config.8 4042 RMD160 45423a37c82cb0cd89e581931ce085f80c3c631a SHA1 b080eff9bf82ce5f7145a5881bce0c3f9ea1c1ec SHA256 30e3c818c3a618d5ad2fa309607ce5fec081d24591d8e31da50b1767b69d5763
 EBUILD binutils-config-1.9-r4.ebuild 626 RMD160 e3018b7b6f690abddde9e2a25ce8a727dfcf14d0 SHA1 dd3547d1bbe52d600e3f59b9a45e806a327ea070 SHA256 4445f3282acda5b7c96146974adefc47315c437b5eb008daab9ac5f87a18d99d
 EBUILD binutils-config-2-r1.ebuild 627 RMD160 aa041873d7910e368022522fe1281af8cc16d2ad SHA1 2469140bb41e5ba03e85d4326194587e83701644 SHA256 06d97c5306e671ccf55fcad8eec8dcd20e1c6c3bb8e4646771d62af5f1e1754f
 EBUILD binutils-config-3.ebuild 636 RMD160 9c8011de431f2b997aa1d4e181d4232b09c1c860 SHA1 bf31e1b75bad413cba7957324d44fab2a22ea157 SHA256 e6b4c164d4b751353321ca257a13017d538bb14c4031e9dc82db4ac87b1f3317
-MISC ChangeLog 7691 RMD160 9d6a9deaae046adf3db27938de1b496c9d67eb2f SHA1 0d54840995ca82790d6ba72a9a9c896a9a60300e SHA256 3219bce43f6f1ede25788876a8182702aa1effc3ba6f05bb18d33a8f19dfaee7
+MISC ChangeLog 7889 RMD160 2945cf7c3d5fa0f0dffa67143232a16f72b75db2 SHA1 9d2f68b37582f6f97f3fa17dc53742dd0a30b0f8 SHA256 4276c83c9cc8a4001b41ca798b7557e0f3bfb128ad1bdd22fee1221012a020c9
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5FjGcACgkQaC/OocHi7JbmnAD/TSY8029Dn6PwqsUQbBFykPCk
-iFIPONTsNv4Qtj3cgs4A/0kJxdctKR/9lzkql3BjzjnvcWfxFsrfGHraP5ZVZmYY
-=k+rH
+iF4EAREIAAYFAk5FjWEACgkQaC/OocHi7JZdKgD9H2PC7/uggbOY56VH7XCU63aj
+vQmND3083nE1RAeXt+4A/20Xi7lNxbQvjbz6vvtRH8VazAV1XB7io99R7MLQ+1Pl
+=utED
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index 967492789e0b..1dee21c12a13 100755
--- a/sys-devel/binutils-config/files/binutils-config-3
+++ b/sys-devel/binutils-config/files/binutils-config-3
@@ -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/binutils-config/files/binutils-config-3,v 1.1 2011/08/12 20:26:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.2 2011/08/12 20:30:20 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -343,7 +343,9 @@ switch_linker() {
 	fi
 
 	# switch it up
+	ebegin "Setting default linker to ${ld} for ${PROFILE}"
 	ln -sf ld.${ld} "${BINPATH}"/ld
+	eend $?
 }
 switch_linker_gold() { switch_linker gold ; }
 switch_linker_bfd() { switch_linker bfd ; }
@@ -387,7 +389,7 @@ while [[ $# -gt 0 ]] ; do
 		-h|--help)                 usage 0 ;;
 		-V|--version)
 			unset Header
-			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.1 2011/08/12 20:26:09 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.2 2011/08/12 20:30:20 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }
@@ -432,7 +434,7 @@ set_HOST
 case ${DOIT} in
 switch_profile|switch_linker_*)
 	# decode user's profile choice
-	x=${UARG}
+	x=${UARG:-$(TARGET=${HOST} set_current_profile)}
 	PROFILE=""
 	if [[ -z $(echo ${x} | tr -d '[:digit:]') ]] ; then
 		# User gave us a # representing the profile