Add support for profile selection based on the active version of a specified target.

(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)

3 files changed, 14 insertions, 5 deletions

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index f127733764ed..d7c7079499cb 100644
--- a/sys-devel/binutils-config/ChangeLog
+++ b/sys-devel/binutils-config/ChangeLog
@@ -1,6 +1,11 @@
 # 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.46 2011/08/12 20:30:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/ChangeLog,v 1.47 2011/08/12 20:34:00 vapier Exp $
+
+  12 Aug 2011; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3,
+  files/binutils-config.8:
+  Add support for profile selection based on the active version of a specified
+  target.
 
   12 Aug 2011; Mike Frysinger <vapier@gentoo.org> files/binutils-config-3:
   Also support linker switching for current profile, and add some helpful user
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index 1dee21c12a13..ffa835307c68 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.2 2011/08/12 20:30:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.3 2011/08/12 20:34:00 vapier Exp $
 
 # Format of /etc/env.d/binutils/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -389,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.2 2011/08/12 20:30:20 vapier Exp $"
+			cvsver="$Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-config/files/binutils-config-3,v 1.3 2011/08/12 20:34:00 vapier Exp $"
 			cvsver=${cvsver##*binutils-config-}
 			bver=${cvsver%%,v *}
 			cvsver=${cvsver#* }
@@ -461,8 +461,11 @@ switch_profile|switch_linker_*)
 				eerror "${argv0}: Could not locate '$x' in '${ENV_D}/'!"
 				exit 1
 			fi
+			PROFILE=${x}
+		else
+			# Maybe they just gave us a target ... pick active profile
+			PROFILE=$(TARGET=${x} set_current_profile)
 		fi
-		PROFILE=${x}
 	fi
 	;;
 *)
diff --git a/sys-devel/binutils-config/files/binutils-config.8 b/sys-devel/binutils-config/files/binutils-config.8
index 9c83ee7adfb8..4aaaa71810e7 100644
--- a/sys-devel/binutils-config/files/binutils-config.8
+++ b/sys-devel/binutils-config/files/binutils-config.8
@@ -25,7 +25,8 @@ changing an active cross-compiler will not break your native compiler
 Change the system to use the specified binutils version.  This may take the
 form of the list index number (the number shown on the left in the
 \fB\-\-list\-profiles\fR output), a full \fITARGET-VERSION\fR (useful when
-working with cross-compilers), or just a binutils \fIVERSION\fR where the
+working with cross-compilers), just a \fITARGET\fR where the \fIVERSION\fR
+is picked from the active, or just a binutils \fIVERSION\fR where the
 \fITARGET\fR is assumed to be the native \fIHOST\fR value.
 .TP
 \fBTARGET\fR