Use CTARGET from the env.d file by default to better work with custom GCC_VER.

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

4 files changed, 100 insertions, 7 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 34a7545a612d..dc343bc3d80b 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.204 2012/03/06 14:14:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.205 2012/03/15 01:16:44 vapier Exp $
+
+*gcc-config-1.5.1-r1 (15 Mar 2012)
+
+  15 Mar 2012; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.5.1,
+  +gcc-config-1.5.1-r1.ebuild:
+  Use CTARGET from the env.d file by default to better work with custom
+  GCC_VER.
 
   06 Mar 2012; Brent Baude <ranger@gentoo.org> gcc-config-1.5-r2.ebuild:
   Marking gcc-config-1.5-r2 ppc for bug 406351
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 8d00c0eacec0..219a4f329cf4 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,11 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gcc-config-1.4.1 21715 RMD160 21996c504686930b6d57d50d2988031ae254851a SHA1 e19d1d03675c1319bb4b1c07af75007eeaa6e168 SHA256 0b6fd9ff44350638b45875bf8e0c020c503a814270e2093733293d87e7ea26d6
 AUX gcc-config-1.5 20085 RMD160 5acb920190c96e75a524d35c1e5c9dafedad0f9e SHA1 b4e8d0dbe28d0737f3c7654d5ef1e49f00ddc775 SHA256 d35d9de2c3950c036a39c184dd5ef10777925d683b8b9c7a6ef6e33cecaddde9
-AUX gcc-config-1.5.1 20865 RMD160 406cf6fd9f8ce8d9fd94835ba19f229bd32cf18d SHA1 09a8d4bf12faa1bf1af0a72f77784ca7a697cc6e SHA256 317b1bfae61e61a280cdc518d0505eb13d6f525d8f6a5698f17a5d1c2470eb94
+AUX gcc-config-1.5.1 21018 RMD160 7dcacda1c00126c0b4f085b5c996d7aa6be12344 SHA1 0558693925f9a1cb4442d7a05ff6d6d81a841453 SHA256 383c0b113548e826191842d1b5eed83303eee142fbc77547021a915f8b2a9c12
 AUX wrapper-1.5.1.c 9788 RMD160 b628944ee01dd772eb917cd08d13dc41bf58409f SHA1 51ac1f9419bc2230a9ce2196e70b5ee4ba61be18 SHA256 991981059fdcd0a9c76d73ff2ce576e553f37ae7d3b378b92ead553963f7339a
 AUX wrapper-1.5.2.c 8021 RMD160 1b008c513fc38009665964b6dfeafa66e1899fb8 SHA1 1a83c24b859b0b61fe6dc420debe57054eb87a1b SHA256 5ed07f88103ecea30f66a4415421f90d1ddfdd4a902aa34a346a7883cd947e36
 EBUILD gcc-config-1.4.1-r1.ebuild 1645 RMD160 4d94a4a9be9fe092e6b6ba3f0cb665641271e58a SHA1 d9aa6e233c13827c6a551b9b6b3a21efe5eb230c SHA256 f19f05b52db8eb0816ad4953ecba68a28943a6c8948439edc35c56ce18761b1d
 EBUILD gcc-config-1.5-r1.ebuild 1647 RMD160 ebd03e749a514a0cf446ae323e7bf8e6926621e2 SHA1 da17446b4b83cce6d3d488b77eab1b1d7a496db8 SHA256 96e9b0e83ac1ce0e194f839b0dbfa713beb3951c7c53619fe80afaacba8f0c7b
 EBUILD gcc-config-1.5-r2.ebuild 1640 RMD160 879a5be63a4f411890cd1a9610a5d9a3266ea781 SHA1 2fceccc06431181b9e82d04af098fd400db9e6f8 SHA256 ae5efae34d1d6569a8f485f7d52d9b524a92b31d151ae5c8435eb55583400073
+EBUILD gcc-config-1.5.1-r1.ebuild 1647 RMD160 335751e0ed2674a83df1aa7d1abddbfa0baf07ae SHA1 db7d584cdcf470c74df2ec23ad9a205d7be8f9f6 SHA256 a7794c24c16349756f5d13f25899d94477069e89ecfa76ca4952f7073a61f058
 EBUILD gcc-config-1.5.1.ebuild 1644 RMD160 d9666b07a23a678fe1c13185475101a9dcf3373b SHA1 b3b1e5992c0cf68aeb657c5066fb7e13d6e5ce29 SHA256 d608e32fe85c65266178acecd5be054230e78d0ecb85779974f524fe5d10d139
-MISC ChangeLog 36413 RMD160 0466e804852977b2e1d46579be112ffe70c34149 SHA1 2f24ee24f036c0420d562a15e4e79c4ad7be38d5 SHA256 065df4d776ec0540b8d17d931d544a416a9ea55c941517f9033d4892bdb3c28a
+MISC ChangeLog 36638 RMD160 a1de2c23b69a02b1ee3ae46128f4095afe1a462f SHA1 a518f65c7293f9376b390b55e54b01257d8324d2 SHA256 1600a04fbb1403da476a06ef33ec560e4465a57c442fb054e07c61c4ce516632
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPYUMFAAoJELEHsLL7fEFW12gP/02MI2LInCLWdFaPG69Jcxv8
+hfBmssykj73qXRmbGev8Q5y4UWEv1PDsApK5vY78RhF7Y8OkLVtpi23KXhWuhhY8
+3DVMuRHcXetNUb3tyPvE0PA7Pfxwz6/gsxGp5Qs8OcWl9pwEbMDbU4IduMAEUJZq
+FcxI8iKQ3OBLL2MGe0QuHSxXi1DCneWivsuMN2tqUuSm73X8cZBxU9HNIxH+1n+v
+rnB5t/q4dakF4z+He9HjlqwJh+rODnXM4LsNqAw3fBWqruWlqVvf5TlVT3FJEiBT
+ZS4vEaha2QwEbZ5hdB3266B7nEb4sLiVUtsubsHHWTlvEErLhZl66y4ZWEax85il
+1U1oFI1+xMrrEi2Y3BnuGxVppwd/CDwdoqezh9nI9QaUxbiCisbMBji7+pfFdeLz
+G3c31xn77+LTE/5ceZOCCJXU1ZWoiXSqTTJd8Y3lGh1ERp0CjzkZx3Q/2A7Ipb6E
+AVCduQd70daPhbpajl5hPXZhFa4mPrOD4Et3LkNzkq85KLLDTCOuvNRaokG3Jig3
+tnvtTxhw9rXHZpZDC9yBQGSMG8FyMkThYYnJKJedmuXeOnx/+hIQOXNOWC5jX2RP
+34kQs4sqZUm/SHj8ijceaCsshIJnJbUZCUsTM7zEnjiieKooTq5qixVDHkS9r/qR
+yXdR8zYL18ysVxAEQRe6
+=eqN9
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/gcc-config-1.5.1 b/sys-devel/gcc-config/files/gcc-config-1.5.1
index 65c06a4ce8c7..e295ce3c9ff9 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.5.1
+++ b/sys-devel/gcc-config/files/gcc-config-1.5.1
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2012 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.5.1,v 1.1 2012/02/29 20:16:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5.1,v 1.2 2012/03/15 01:16:44 vapier Exp $
 
 # Format of /etc/env.d/gcc/:
 #  config-TARGET:	CURRENT=version for TARGET
@@ -651,9 +651,9 @@ for x in "$@" ; do
 			rcsfile="$RCSfile: gcc-config-1.5.1,v $"
 			rcsfile=${rcsfile#: }
 			rcsfile=${rcsfile%,v*}
-			cvsrev="$Revision: 1.1 $"
+			cvsrev="$Revision: 1.2 $"
 			cvsrev=${cvsrev#: }
-			cvsdate="$Date: 2012/02/29 20:16:56 $"
+			cvsdate="$Date: 2012/03/15 01:16:44 $"
 			cvsdate=${cvsdate#: }
 			echo "${rcsfile} (r${cvsrev% *} @ ${cvsdate% *})"
 			exit 0
@@ -731,7 +731,11 @@ if [[ ${DOIT} != "get_current_profile" ]] ; then
 	source_var GCC_VER "${GCC_ENV_D}/${CC_COMP}"
 
 	CC_COMP_VERSION=${GCC_VER:-$(chop_gcc_ver_spec ${CC_COMP})}
-	CC_COMP_TARGET=${CC_COMP%-${CC_COMP_VERSION}*}
+	CC_COMP_TARGET=$(show_var CTARGET "${GCC_ENV_D}/${CC_COMP}")
+	if [[ -z ${CC_COMP_TARGET} ]] ; then
+		# Native configs don't have CTARGET in there.
+		CC_COMP_TARGET=${CC_COMP%-${CC_COMP_VERSION}*}
+	fi
 
 	if [[ ! -d ${ROOT}/${GCC_LIB}/${CC_COMP_TARGET}/${CC_COMP_VERSION} ]]; then
 		CC_COMP_VERSION=${CC_COMP_VERSION%-*}
diff --git a/sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..05d202dbf7b7
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.5.1-r1.ebuild,v 1.1 2012/03/15 01:16:44 vapier Exp $
+
+inherit flag-o-matic toolchain-funcs multilib
+
+# Version of .c wrapper to use
+W_VER="1.5.2"
+
+DESCRIPTION="Utility to change the gcc compiler being used"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="!app-admin/eselect-compiler"
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${FILESDIR}"/wrapper-${W_VER}.c "${S}"/wrapper.c || die
+}
+
+src_compile() {
+	strip-flags
+	emake CC="$(tc-getCC)" wrapper || die "compile wrapper"
+}
+
+src_install() {
+	newbin "${FILESDIR}"/${PN}-${PV} ${PN} || die "install gcc-config"
+	sed -i \
+		-e "s:@GENTOO_LIBDIR@:$(get_libdir):g" \
+		"${D}"/usr/bin/${PN}
+
+	exeinto /usr/$(get_libdir)/misc
+	newexe wrapper gcc-config || die "install wrapper"
+}
+
+pkg_postinst() {
+	# Scrub eselect-compiler remains
+	if [[ -e ${ROOT}/etc/env.d/05compiler ]] ; then
+		rm -f "${ROOT}"/etc/env.d/05compiler
+	fi
+
+	# Make sure old versions dont exist #79062
+	rm -f "${ROOT}"/usr/sbin/gcc-config
+
+	# We not longer use the /usr/include/g++-v3 hacks, as
+	# it is not needed ...
+	[[ -L ${ROOT}/usr/include/g++ ]] && rm -f "${ROOT}"/usr/include/g++
+	[[ -L ${ROOT}/usr/include/g++-v3 ]] && rm -f "${ROOT}"/usr/include/g++-v3
+
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+}