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

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

diff --git a/sys-devel/binutils-config/ChangeLog b/sys-devel/binutils-config/ChangeLog
index f127733764ed54f9a2bd603b6d3f60cb52f2242e..d7c7079499cba0cabcd6380e5725bf5a08862fec 100644 (file)
--- 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/Manifest b/sys-devel/binutils-config/Manifest
index 0facb97058bee0cb5a7a8e02facf248231a39190..971e30e09b88949f166a684add022948bfc260c9 100644 (file)
--- 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 12894 RMD160 0741e2827a3df0cbed8f77ea67db90e7e4516b1e SHA1 cae96a0f44fb9f669100ff34f08191c6aad43c34 SHA256 a20d432fdab9f290028dc26931e0ee8757d5f671338f4b5147cc5ce964cefc22
-AUX binutils-config.8 4042 RMD160 45423a37c82cb0cd89e581931ce085f80c3c631a SHA1 b080eff9bf82ce5f7145a5881bce0c3f9ea1c1ec SHA256 30e3c818c3a618d5ad2fa309607ce5fec081d24591d8e31da50b1767b69d5763
+AUX binutils-config-3 13010 RMD160 d1153b24ee2c856caf8aef7fea8bb86835c8f503 SHA1 97a3ff738e01a4fd65daec0859f9e6ac38e94bcc SHA256 64f74a24bb4a808f79b53353c7cec1548dd62df28abddd1231521e3314570b1c
+AUX binutils-config.8 4113 RMD160 7eea52f777b889b08b58e6d836de187e9505be8b SHA1 e97d7ca363524bbfb3c8cf8e17c5775dc6236be7 SHA256 ec7cb82331c80e15581e0936a5bf5edb3cde78bec3c3ede647926821086a1e6f
 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 7889 RMD160 2945cf7c3d5fa0f0dffa67143232a16f72b75db2 SHA1 9d2f68b37582f6f97f3fa17dc53742dd0a30b0f8 SHA256 4276c83c9cc8a4001b41ca798b7557e0f3bfb128ad1bdd22fee1221012a020c9
+MISC ChangeLog 8081 RMD160 b894fba22e24407af8e86110ad328b035028271c SHA1 a9468e3d35ca10a8c4f1da6f456710a146c7a4a6 SHA256 3dbf29d272063973760cbc3e7489e7db25333a5a52536956fcaf17ec49c824a8
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5FjWEACgkQaC/OocHi7JZdKgD9H2PC7/uggbOY56VH7XCU63aj
-vQmND3083nE1RAeXt+4A/20Xi7lNxbQvjbz6vvtRH8VazAV1XB7io99R7MLQ+1Pl
-=utED
+iF4EAREIAAYFAk5Fjj4ACgkQaC/OocHi7JbMtAD/RfzQ3hCiPUyTjW2aWNGaNMfR
+V+h+I23N+SCry8WrqXoA+wR8hVC+8gwpyOQQoCRimFPQRYXeYGGpP6ESvJU1PeWm
+=kMU0
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index 1dee21c12a133e7c0473c8e30dbf6939a19c1114..ffa835307c680aef6e68f05119fb57ca22b033af 100755 (executable)
--- 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 9c83ee7adfb86dd64109029f3329cb0000d2898e..4aaaa71810e762745f1888797b07ad3594560f85 100644 (file)
--- 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