made the compatibility check look for the actual .so instead of just the versioned directory that contains it because there may or may not be any shared objects to back up... The PPC-specific gcc 3.3.3 ebuilds for some reason install libstdc++ directly to /usr/lib/ on PPC64, so this change should allow gcc 3.4.0-r1 to install on this arch without tar failing.

4 files changed, 48 insertions, 8 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 3ad3edc64d04..42c0eac660d1 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.239 2004/05/06 21:04:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.240 2004/05/07 02:01:08 lv Exp $
+
+  06 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r3.ebuild,
+  gcc-3.3.3.ebuild, gcc-3.4.0-r1.ebuild:
+  made the compatibility check look for the actual .so instead of just the
+  versioned directory that contains it because there may or may not be any
+  shared objects to back up... The PPC-specific gcc 3.3.3 ebuilds for some
+  reason install libstdc++ directly to /usr/lib/ on PPC64, so this change should
+  allow gcc 3.4.0-r1 to install on this arch without tar failing.
+
+  06 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.3.3-r3.ebuild,
+  gcc-3.3.3.ebuild, gcc-3.4.0-r1.ebuild:
+  copied the sed magick from 3.3.3-r4 that should fix building gcc with binutils
+  2.15.90.0.3 and then downgrading to a previous version. it disables the
+  --as-needed support that only gets compiled in when using binutils 2.15.90.0.2
+  or higher (proper support of which has been moved back to a gcc 3.5 target)
 
   06 May 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.0-r1.ebuild:
   added gcc333_pre20040408-stack-size.patch for testing on ppc64
diff --git a/sys-devel/gcc/gcc-3.3.3-r3.ebuild b/sys-devel/gcc/gcc-3.3.3-r3.ebuild
index b017abac874e..960d9fb8e289 100644
--- a/sys-devel/gcc/gcc-3.3.3-r3.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r3.ebuild,v 1.6 2004/05/03 09:14:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3-r3.ebuild,v 1.7 2004/05/07 02:01:08 lv Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc"
 
@@ -388,6 +388,13 @@ src_unpack() {
 	# Misdesign in libstdc++ (Redhat)
 	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
+	# disable --as-needed from being compiled into gcc specs
+	# natively when using >=sys-devel/binutils-2.15.90.0.3 this is
+	# done to keep our gcc backwards compatible with binutils. 
+	# gcc 3.4.1 cvs has patches that need back porting.. 
+	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
+	sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
+
 	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
 }
 
diff --git a/sys-devel/gcc/gcc-3.3.3.ebuild b/sys-devel/gcc/gcc-3.3.3.ebuild
index 160a515c4a24..66053f98e69d 100644
--- a/sys-devel/gcc/gcc-3.3.3.ebuild
+++ b/sys-devel/gcc/gcc-3.3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3.ebuild,v 1.8 2004/04/25 03:35:50 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3.ebuild,v 1.9 2004/05/07 02:01:08 lv Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj"
 
@@ -342,6 +342,13 @@ src_unpack() {
 	# Misdesign in libstdc++ (Redhat)
 	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
+	# disable --as-needed from being compiled into gcc specs
+	# natively when using >=sys-devel/binutils-2.15.90.0.3 this is
+	# done to keep our gcc backwards compatible with binutils. 
+	# gcc 3.4.1 cvs has patches that need back porting.. 
+	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
+	sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
+
 	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
 }
 
diff --git a/sys-devel/gcc/gcc-3.4.0-r1.ebuild b/sys-devel/gcc/gcc-3.4.0-r1.ebuild
index 02b6a1dca4a3..ae95de279e28 100644
--- a/sys-devel/gcc/gcc-3.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r1.ebuild,v 1.3 2004/05/06 21:04:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.0-r1.ebuild,v 1.4 2004/05/07 02:01:08 lv Exp $
 
 IUSE="static nls bootstrap java build X multilib gcj f77 objc hardened uclibc"
 
@@ -427,6 +427,13 @@ src_unpack() {
 	# Misdesign in libstdc++ (Redhat)
 	cp -a ${S}/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
+	# disable --as-needed from being compiled into gcc specs
+	# natively when using >=sys-devel/binutils-2.15.90.0.3 this is
+	# done to keep our gcc backwards compatible with binutils. 
+	# gcc 3.4.1 cvs has patches that need back porting.. 
+	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992 (May 3 2004)
+	sed -i -e s/HAVE_LD_AS_NEEDED/USE_LD_AS_NEEDED/g ${S}/gcc/config.in
+
 	cd ${S}; ./contrib/gcc_update --touch &> /dev/null
 }
 
@@ -624,14 +631,18 @@ src_install() {
 	# libstdc++, we need to provide compatibility for binary-only apps
 	# which are linked against the old version. Every arch should have
 	# one of these marked stable, so lets look for the newest version
-	# first.
-	if [ -d ${LOC}/lib/gcc-lib/${CCHOST}/3.3.3 ]
+	# first. We need to check for the .so instead of just the directory
+	# because there may or may not be any shared objects to back up...
+	# The PPC-specific gcc 3.3.3 ebuilds for some reason install directly
+	# to /usr/lib/ on PPC64, so we'll have to add logic for this later. :/
+	# Travis Tilley <lv@gentoo.org>
+	if [ -f ${LOC}/lib/gcc-lib/${CCHOST}/3.3.3/libstdc++.so ]
 	then
 		gcc_compat 3.3.3
-	elif [ -d ${LOC}/lib/gcc-lib/${CCHOST}/3.3.2 ]
+	elif [ -f ${LOC}/lib/gcc-lib/${CCHOST}/3.3.2/libstdc++.so ]
 	then
 		gcc_compat 3.3.2
-	elif [ -d ${LOC}/lib/gcc-lib/${CCHOST}/3.2.3 ]
+	elif [ -f ${LOC}/lib/gcc-lib/${CCHOST}/3.2.3/libstdc++.so ]
 	then
 		gcc_compat 3.2.3
 	fi