From 4371314b5add86a95b399d92bf3bb5de3bb03b6e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 5 Dec 2004 08:10:16 +0000 Subject: [PATCH] Err, we want to handle GCC_SPECS, not GCC_CONFIG. Also make sure duplicate paths arent duplicated in LDPATH now that gcc is exporting multiple spec files per ebuild. --- sys-devel/gcc-config/ChangeLog | 10 +++++++++- sys-devel/gcc-config/Manifest | 14 +++++++------- ...config-1.3.7-r4 => digest-gcc-config-1.3.7-r5} | 0 sys-devel/gcc-config/files/gcc-config-1.3.7 | 15 ++++++--------- ...1.3.7-r4.ebuild => gcc-config-1.3.7-r5.ebuild} | 2 +- 5 files changed, 23 insertions(+), 18 deletions(-) rename sys-devel/gcc-config/files/{digest-gcc-config-1.3.7-r4 => digest-gcc-config-1.3.7-r5} (100%) rename sys-devel/gcc-config/{gcc-config-1.3.7-r4.ebuild => gcc-config-1.3.7-r5.ebuild} (95%) diff --git a/sys-devel/gcc-config/ChangeLog b/sys-devel/gcc-config/ChangeLog index 934dda12e09d..df560ee6c3ae 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.67 2004/12/03 21:39:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/ChangeLog,v 1.68 2004/12/05 08:10:16 vapier Exp $ + +*gcc-config-1.3.7-r5 (05 Dec 2004) + + 05 Dec 2004; Mike Frysinger files/gcc-config-1.3.7, + -gcc-config-1.3.7-r4.ebuild, +gcc-config-1.3.7-r5.ebuild: + Err, we want to handle GCC_SPECS, not GCC_CONFIG. Also make sure duplicate + paths arent duplicated in LDPATH now that gcc is exporting multiple spec + files per ebuild. *gcc-config-1.3.7-r4 (03 Dec 2004) diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest index acdff0f2a220..acd7f39ed24b 100644 --- a/sys-devel/gcc-config/Manifest +++ b/sys-devel/gcc-config/Manifest @@ -1,20 +1,20 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 5af7f23de1f7b79d6a6edc6facb481f3 ChangeLog 13007 +MD5 b912b6ff088d9ea18327c905dc2282b2 gcc-config-1.3.7-r5.ebuild 1427 +MD5 eada6d619ecaf729aa80d194fcebb102 ChangeLog 13350 MD5 0a250a07d02f1343f64fe7f7bbdbd820 gcc-config-1.3.6-r4.ebuild 2636 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 -MD5 a397e78b19d4052c04c1895b6da3de66 gcc-config-1.3.7-r4.ebuild 1427 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.6-r4 0 MD5 2902e905147ff6ba0703f0f72660aa9a files/wrapper-1.4.3.c 8434 MD5 5f5ba2d67203ed8386ae76352f15000d files/gcc-config-1.3.6 10285 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r4 0 -MD5 63e3b7a19daaa9442cc9fc21807f5e69 files/gcc-config-1.3.7 11815 +MD5 44a8e5590677f8daa64ade7a42dd6f61 files/gcc-config-1.3.7 11809 MD5 e64a89abafa7f6f7d16c2540fb0edcf4 files/wrapper-1.4.2.c 7381 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gcc-config-1.3.7-r5 0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBsV9nroRuSHgZdywRAic0AJ907XeS6Q3PjHObstnG6tvlrgBQuwCgjOQL -t25Y0pE+EW1l7BB5camKYoY= -=EjxK +iD8DBQFBssKDroRuSHgZdywRAoLBAJ41xQc06E5jOZsHmDBS8K3m0KrOvwCfRfSc +qHgWP6I5YMKW6Icwvqfpto8= +=ClKE -----END PGP SIGNATURE----- diff --git a/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r4 b/sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r5 similarity index 100% rename from sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r4 rename to sys-devel/gcc-config/files/digest-gcc-config-1.3.7-r5 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 604fc92b3b32..32f133ef408a 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.7 2004/12/03 21:39:59 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.3.7,v 1.8 2004/12/05 08:10:16 vapier Exp $ # Author: Martin Schlemmer trap ":" INT QUIT TSTP @@ -131,6 +131,7 @@ switch_profile() { GCC_PROFILES="${GCC_ENV_D}/${CC_COMP} ${GCC_PROFILES}" # Extract all LDPATH's for our CHOST + MY_LDPATH="" for x in ${GCC_PROFILES} do if [ -f "${x}" ] @@ -143,14 +144,9 @@ switch_profile() { local sub_ldpath= for sub_ldpath in ${LDPATH} do - if [ -z "${MY_LDPATH}" ] + if [ -d "${sub_ldpath}" ] then - if [ -d "${sub_ldpath}" ] - then - MY_LDPATH="${sub_ldpath}" - fi - else - if [ -d "${sub_ldpath}" ] + if [ "${MY_LDPATH/:${sub_ldpath}}" = "${MY_LDPATH}" ] then MY_LDPATH="${MY_LDPATH}:${sub_ldpath}" fi @@ -159,10 +155,11 @@ switch_profile() { export IFS="${old_IFS}" fi done + MY_LDPATH="${MY_LDPATH:1}" # trim leading : fi # Setup things properly again for this profile - unset GCC_CONFIG + unset GCC_SPECS source "${GCC_ENV_D}/${CC_COMP}" OLD_CC_COMP=$(get_current_profile) diff --git a/sys-devel/gcc-config/gcc-config-1.3.7-r4.ebuild b/sys-devel/gcc-config/gcc-config-1.3.7-r5.ebuild similarity index 95% rename from sys-devel/gcc-config/gcc-config-1.3.7-r4.ebuild rename to sys-devel/gcc-config/gcc-config-1.3.7-r5.ebuild index 53ce2fc26e30..80c442502d7b 100644 --- a/sys-devel/gcc-config/gcc-config-1.3.7-r4.ebuild +++ b/sys-devel/gcc-config/gcc-config-1.3.7-r5.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-r4.ebuild,v 1.2 2004/12/04 06:55:09 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/gcc-config-1.3.7-r5.ebuild,v 1.1 2004/12/05 08:10:16 vapier Exp $ inherit toolchain-funcs -- 2.26.2