Seems people still have outdated gcc versions installed which break with GCC_SPECS="". Add a warning if their gcc is broken so they know they have to re-emerge gcc.

5 files changed, 35 insertions, 14 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 05a14b0c4c9e..e1bf6ccbb17b 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gcc-config
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.70 2004/12/23 18:04:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.71 2004/12/24 05:46:23 vapier Exp $
+
+*gcc-config-1.3.8-r1 (24 Dec 2004)
+
+  24 Dec 2004; Mike Frysinger <vapier@gentoo.org> files/gcc-config-1.3.8,
+  +gcc-config-1.3.8-r1.ebuild, -gcc-config-1.3.8.ebuild:
+  Seems people still have outdated gcc versions installed which break with
+  GCC_SPECS="". Add a warning if their gcc is broken so they know they have to
+  re-emerge gcc.
 
 *gcc-config-1.3.8 (23 Dec 2004)
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 4212aa796356..0b0987b1a0fb 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ebc39c1fa68f338a78c5ba7eacd7c9a5 ChangeLog 13937
+MD5 ba976e0d3f974115680d3bc3ca22a3a6 gcc-config-1.3.8-r1.ebuild 1359
+MD5 edfe90e24dbfe7a49d28f0c37ba4ea8b ChangeLog 14276
 MD5 0a250a07d02f1343f64fe7f7bbdbd820 gcc-config-1.3.6-r4.ebuild 2636
-MD5 aee6000b2eef723920065565d19b4c4e gcc-config-1.3.8.ebuild 1356
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 626c17691d48b229f5c619618bf365c0 gcc-config-1.3.7-r6.ebuild 1395
-MD5 6ef0c90ba3d351d20448c6e0a41fb769 files/gcc-config-1.3.8 11956
+MD5 3284763a25d3f43f7c29fc765be2defd files/gcc-config-1.3.8 12381
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r4 0
 MD5 11d24a6f5defba5a8a8bbc65f26e2215 files/wrapper-1.4.2.c 7439
 MD5 5f5ba2d67203ed8386ae76352f15000d files/gcc-config-1.3.6 10285
 MD5 dc0ff3c291392d8abac22d82a8593ab6 files/wrapper-1.4.3.c 7545
 MD5 0c96b0464e9cec87312b5fa06d8c138b files/gcc-config-1.3.7 11800
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8-r1 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r6 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.8 0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBy32/roRuSHgZdywRAqBuAJ9k0raPA126jhVJ3PKJqjzR07yqUQCfTV1p
-JLEALRbRNxvNdrE0VczPRs0=
-=dniK
+iD8DBQFBy61HroRuSHgZdywRAmBSAKCPWI+u8Zy95XM6vhrekfxxTbUqGACfWdw8
+lByDvb0Kl3UnVhcDvwUsLkU=
+=Ab6Z
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.8 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.8-r1
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.8
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.8-r1
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.8 b/sys-devel/gcc-config/files/gcc-config-1.3.8
index 309f49694423..ee8c1176252f 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.8
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.8
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 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.3.8,v 1.1 2004/12/23 18:04:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.8,v 1.2 2004/12/24 05:46:24 vapier Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 trap ":" INT QUIT TSTP
@@ -89,7 +89,7 @@ get_real_chost() {
 
 is_cross_compiler() {
 	get_real_chost
-	[ "${CC_COMP/${REAL_CHOST}}" = "${CC_COMP}" ]
+	[[ ${CC_COMP/${REAL_CHOST}} = ${CC_COMP} ]]
 }
 
 switch_profile() {
@@ -160,11 +160,24 @@ switch_profile() {
 		${AWK} '!/^(STDCXX_INCDIR|LDPATH|CC|CXX|CTARGET|GCCBITS|GCC_SPECS)=/ {print $0}' \
 			"${GCC_ENV_D}/${CC_COMP}" > "${ENV_D}/05gcc"
 		echo "LDPATH=\"${MY_LDPATH}\"" >> "${ENV_D}/05gcc"
-		if [[ -n ${GCC_SPECS} ]] && [[ -e ${ROOT}/${GCC_SPECS} ]]
-		then
+		if [[ -n ${GCC_SPECS} ]] && [[ -e ${ROOT}/${GCC_SPECS} ]] ; then
 			echo "GCC_SPECS=\"${GCC_SPECS}\"" >> "${ENV_D}/05gcc"
 		else
-			echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+			# People need to rebuild their gcc or setting GCC_SPECS to
+			# "" will cause issues again :(
+			if [[ ${ROOT} != "/" ]] ; then
+				echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+			else
+				if ! GCC_SPECS="" /usr/bin/gcc -v &>/dev/null ; then
+					echo
+					ewarn "Your gcc has a bug with GCC_SPECS."
+					ewarn "Please re-emerge gcc."
+					ewarn "http://bugs.gentoo.org/show_bug.cgi?id=68395"
+					echo
+				else
+					echo "GCC_SPECS=\"\"" >> "${ENV_D}/05gcc"
+				fi
+			fi
 		fi
 
 		echo "CURRENT=${CC_COMP}" > "${GCC_ENV_D}/config"
diff --git a/sys-devel/gcc-config/gcc-config-1.3.8.ebuild b/sys-devel/gcc-config/gcc-config-1.3.8-r1.ebuild
index 182ff2847f37..f9f558c4ffcf 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.8.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.3.8.ebuild,v 1.4 2004/12/24 02:23:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.8-r1.ebuild,v 1.1 2004/12/24 05:46:23 vapier Exp $
 
 inherit toolchain-funcs