Fixed Bug 72557, where gcc-config would get very confused with non-gcc-lib ldpaths

8 files changed, 34 insertions, 17 deletions

diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog
index 17256f31abf2..beb3a0ccdee5 100644
--- a/sys-devel/gcc-config/ChangeLog
+++ b/sys-devel/gcc-config/ChangeLog
@@ -1,6 +1,15 @@
 # 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.64 2004/10/26 18:15:30 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.65 2004/11/28 16:39:49 lv Exp $
+
+*gcc-config-1.3.7-r2 (28 Nov 2004)
+
+  28 Nov 2004; Travis Tilley <lv@gentoo.org> files/gcc-config-1.3.6,
+  files/gcc-config-1.3.7, -gcc-config-1.3.6-r3.ebuild,
+  +gcc-config-1.3.6-r4.ebuild, -gcc-config-1.3.7-r1.ebuild,
+  +gcc-config-1.3.7-r2.ebuild:
+  Fixed Bug 72557, where gcc-config would get very confused with non-gcc-lib
+  ldpaths
 
   26 Oct 2004; Martin Schlemmer <azarah@gentoo.org> +files/wrapper-1.4.3.c:
   Add GCCBITS support to wrapper.
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index fafd48ef3cd3..82de2f4983b1 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,10 +1,10 @@
-MD5 12a6abe6a3a2ed48dfb04a1eba513218 ChangeLog 12055
-MD5 a2d9bdf9289e087270255d4ace14b88b gcc-config-1.3.6-r3.ebuild 2640
+MD5 fb92a87e88e95710087422ef18122a62 ChangeLog 12390
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 cf613ce812b75ec6355c3a368f09aa87 gcc-config-1.3.7-r1.ebuild 2241
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r3 0
-MD5 2902e905147ff6ba0703f0f72660aa9a files/wrapper-1.4.3.c 8434
-MD5 f9ac19eaceaad00963038bc3d3d11b98 files/gcc-config-1.3.6 10163
-MD5 1bc5a05334c1d92a5aa3ed9614e465ea files/gcc-config-1.3.7 11225
+MD5 5e7e8f8d7232831caffe9be66ae6e6cc gcc-config-1.3.7-r2.ebuild 2237
+MD5 0a250a07d02f1343f64fe7f7bbdbd820 gcc-config-1.3.6-r4.ebuild 2636
 MD5 e64a89abafa7f6f7d16c2540fb0edcf4 files/wrapper-1.4.2.c 7381
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r1 0
+MD5 2902e905147ff6ba0703f0f72660aa9a files/wrapper-1.4.3.c 8434
+MD5 9e12dace91fe2992fd43427b5f686a49 files/gcc-config-1.3.7 11339
+MD5 5f5ba2d67203ed8386ae76352f15000d files/gcc-config-1.3.6 10285
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r2 0
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.6-r3 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.6-r4
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.6-r3
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.6-r4
diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r1 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r2
index e69de29bb2d1..e69de29bb2d1 100644
--- a/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r1
+++ b/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r2
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.6 b/sys-devel/gcc-config/files/gcc-config-1.3.6
index c13c8b49128a..95ea46653b73 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.6
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.6
@@ -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.6,v 1.8 2004/10/11 14:36:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.6,v 1.9 2004/11/28 16:39:49 lv Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 source /etc/init.d/functions.sh || {
@@ -459,10 +459,14 @@ fi
 
 CC_COMP_NO_SPECS=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4"-"$5 }')
 
-if [ ! -d "/usr/lib/gcc-lib/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-}" -o \
+GCC_LIB="$(source /etc/env.d/gcc/${CC_COMP}
+	cmd_setup
+	echo ${LDPATH} | ${AWK} -F/ '{ print  "/"$2"/"$3"/"$4"/" }')"
+
+if [ ! -d "${ROOT}/${GCC_LIB}/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-}" -o \
      ! -f "/etc/env.d/gcc/${CC_COMP}" ]
 then
-	eerror "$0: Profile does not exist or invalid setting for /etc/env.d/gcc/${CC_COMP}"
+	eerror "$0: Profile does not exist or invalid setting for /etc/env.d/gcc/${CC_COMP}" 1>&2
 	#exit 1
 fi
 
diff --git a/sys-devel/gcc-config/files/gcc-config-1.3.7 b/sys-devel/gcc-config/files/gcc-config-1.3.7
index bb55be01e45b..99c7aad4e524 100755
--- a/sys-devel/gcc-config/files/gcc-config-1.3.7
+++ b/sys-devel/gcc-config/files/gcc-config-1.3.7
@@ -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.7,v 1.4 2004/10/26 04:05:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.7,v 1.5 2004/11/28 16:39:49 lv Exp $
 # Author:  Martin Schlemmer <azarah@gentoo.org>
 
 trap ":" INT QUIT TSTP
@@ -486,10 +486,14 @@ fi
 
 CC_COMP_NO_SPECS=$(echo ${CC_COMP} | awk -F- '{ print $1"-"$2"-"$3"-"$4"-"$5 }')
 
-if [ ! -d "${ROOT}/usr/lib/gcc-lib/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-}" -o \
+GCC_LIB=$(source "${GCC_ENV_D}/${CC_COMP}" 
+	cmd_setup
+	echo ${LDPATH} | ${AWK} -F/ '{ print  "/"$2"/"$3"/"$4"/" }')
+
+if [ ! -d "${ROOT}/${GCC_LIB}/${CC_COMP_NO_SPECS%-*}/${CC_COMP_NO_SPECS##*-}" -o \
      ! -f "${GCC_ENV_D}/${CC_COMP}" ]
 then
-	eerror "$0: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}"
+	eerror "$0: Profile does not exist or invalid setting for ${GCC_ENV_D}/${CC_COMP}" 1>&2
 	#exit 1
 fi
 
diff --git a/sys-devel/gcc-config/gcc-config-1.3.6-r3.ebuild b/sys-devel/gcc-config/gcc-config-1.3.6-r4.ebuild
index 64819e7d1e8b..916360655773 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.6-r3.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.6-r4.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.6-r3.ebuild,v 1.5 2004/11/12 17:05:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.6-r4.ebuild,v 1.1 2004/11/28 16:39:49 lv Exp $
 
 inherit toolchain-funcs
 
diff --git a/sys-devel/gcc-config/gcc-config-1.3.7-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.3.7-r2.ebuild
index 91295022f853..29f7334f8479 100644
--- a/sys-devel/gcc-config/gcc-config-1.3.7-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.3.7-r2.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.7-r1.ebuild,v 1.3 2004/11/12 17:05:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.7-r2.ebuild,v 1.1 2004/11/28 16:39:49 lv Exp $
 
 inherit toolchain-funcs