Don't PDEPEND on libstdc++-v3 for n32/n64 systems. Add ABI variable

5 files changed, 66 insertions, 9 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index a4d718013cfb..5eca23b9a2f6 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.301 2004/08/11 18:18:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.302 2004/08/11 19:54:40 iluxa Exp $
 
   11 Aug 2004; Travis Tilley <lv@gentoo.org>
   +files/3.4.1/gcc-3.4.1-glibc-is-native.patch, gcc-3.4.1-r2.ebuild,
@@ -19,6 +19,12 @@
   gcc-3.4.1-r2.ebuild, gcc-3.4.1.ebuild:
   Add the pro-police doc patch.
 
+  05 Aug 2004; Ilya A. Volynets-Evenbach <iluxa@gentoo.org>
+  gcc-3.4.1-r2.ebuild:
+  Disable PDEPEND on libstdc++-v3 for n32/n64 systems. gcc-3.3 didn't work on
+  them ever. Not to mention that libstdc++-v3 simply doesn't build as n32.
+  Also add $ABI variable. It should be set in profile for multi-abi capable arches
+
 *gcc-3.4.1-r2 (03 Aug 2004)
 
   03 Aug 2004; Travis Tilley <lv@gentoo.org>
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 03ba978a5629..1a4a382c442f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -24,11 +24,11 @@ MD5 2d68ea9bddc5ae32edc46b93504bc677 gcc-2.95.3-r8.ebuild 8333
 MD5 cd874b5d941d93ed0dc78586cf006e9a gcc-3.3.3-r3.ebuild 23601
 MD5 f357f60ed2b1c343a0555b94de742cd1 gcc-3.3.2-r6.ebuild 21068
 MD5 d30becfe989175c3d30ff19e941c3822 gcc-3.3.2-r1.ebuild 17813
-MD5 750e3e32c2608a4472c010782b10bcad ChangeLog 62276
+MD5 2c46b9fe151f1b21637401f500180a62 ChangeLog 62599
 MD5 c2cdb224cdf888d8a95ae6c39804c893 gcc-3.3.2.ebuild 17760
 MD5 5c7b94106c929033ea8cac50d7a36d71 gcc-3.3.3_pre20040426.ebuild 22484
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
-MD5 4ca64a9c1abfcce418da2a6d7e8846f4 gcc-3.4.1-r2.ebuild 30520
+MD5 696221b7005a84f2e84f8ec2e08a4d1e gcc-3.4.1-r2.ebuild 31170
 MD5 ad1fa47ddb922205e26c539b444c16da gcc-3.3.3-r5.ebuild 24249
 MD5 f7e7042c2ddf66e344b30cbc66ebaf73 files/cc 24
 MD5 80d122265d3062847a4a1b161abe1d26 files/cpp 24
@@ -119,6 +119,8 @@ MD5 06580106a905e8fa2ff23aa190f9d82c files/3.4.0/gcc-3.4.0-r6-gentoo-branding.pa
 MD5 4edccdf0b4f6dbbc9f7bc9370c255e0c files/3.4.0/gcc34-reiser4-fix.patch 587
 MD5 66edf32babf498517ca56fa44c901f26 files/3.4.0/gcc-3.4.0-move-propolice-into-glibc.patch 894
 MD5 cd770c23ece7458db5e6c5067f262ce0 files/3.4.1/gcc-3.4.1-glibc-is-native.patch 760
+MD5 90b625228a093246fd118a7cd10f7627 files/3.4.1/gcc-3.4.1-mips-n64only.patch 624
+MD5 ffc2f2f211c8777f110bc80a54abe69d files/3.4.1/gcc-3.4.1-mips-n32only.patch 624
 MD5 86ae592deb82c4564eb61f770fe5f8a7 files/3.4.1/gcc-3.4.1-gentoo-branding.patch 759
 MD5 14fec2000fc63536d4cf22195e88e14f files/3.4.1/gcc-3.4.1-r2-gentoo-branding.patch 781
 MD5 df06b1cf70425c78e2e59136ed372ab4 files/3.4.1/gcc341-ppc64-mozilla-ICE-fix.patch 729
diff --git a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n32only.patch b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n32only.patch
new file mode 100644
index 000000000000..4e459afd5f55
--- /dev/null
+++ b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n32only.patch
@@ -0,0 +1,17 @@
+Index: gcc/config/mips/t-linux64
+===================================================================
+RCS file: /cvsroot/gcc/gcc/gcc/config/mips/t-linux64,v
+retrieving revision 1.3
+diff -u -r1.3 t-linux64
+--- gcc/config/mips/t-linux64	4 Jun 2003 05:35:15 -0000	1.3
++++ gcc/config/mips/t-linux64	10 Aug 2004 18:26:26 -0000
+@@ -1,6 +1,6 @@
+-MULTILIB_OPTIONS = mabi=32/mabi=n32/mabi=64
+-MULTILIB_DIRNAMES = o32 32 64
+-MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64
++MULTILIB_OPTIONS = mabi=n32
++MULTILIB_DIRNAMES = 32
++MULTILIB_OSDIRNAMES = ../lib
+ 
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+ 
diff --git a/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n64only.patch b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n64only.patch
new file mode 100644
index 000000000000..bd6bf8b2d092
--- /dev/null
+++ b/sys-devel/gcc/files/3.4.1/gcc-3.4.1-mips-n64only.patch
@@ -0,0 +1,17 @@
+Index: gcc/config/mips/t-linux64
+===================================================================
+RCS file: /cvsroot/gcc/gcc/gcc/config/mips/t-linux64,v
+retrieving revision 1.3
+diff -u -r1.3 t-linux64
+--- gcc/config/mips/t-linux64	4 Jun 2003 05:35:15 -0000	1.3
++++ gcc/config/mips/t-linux64	10 Aug 2004 18:26:53 -0000
+@@ -1,6 +1,6 @@
+-MULTILIB_OPTIONS = mabi=32/mabi=n32/mabi=64
+-MULTILIB_DIRNAMES = o32 32 64
+-MULTILIB_OSDIRNAMES = ../lib ../lib32 ../lib64
++MULTILIB_OPTIONS = mabi=n64
++MULTILIB_DIRNAMES = 64
++MULTILIB_OSDIRNAMES = ../lib
+ 
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+ 
diff --git a/sys-devel/gcc/gcc-3.4.1-r2.ebuild b/sys-devel/gcc/gcc-3.4.1-r2.ebuild
index 3fb1b1849651..81fcd580c18f 100644
--- a/sys-devel/gcc/gcc-3.4.1-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright (C) 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r2.ebuild,v 1.4 2004/08/11 18:18:46 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1-r2.ebuild,v 1.5 2004/08/11 19:54:40 iluxa Exp $
 
 IUSE="static nls bootstrap build multilib gcj gtk f77 objc hardened uclibc n32 n64"
 
@@ -42,8 +42,9 @@ RDEPEND="virtual/libc
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 
-PDEPEND="sys-devel/gcc-config
-	sys-libs/libstdc++-v3"
+PDEPEND="sys-devel/gcc-config"
+[ "${ABI}" != "n32" ] && [ "${ABI}" != "n64" ] && PDEPEND="${PDEPEND}
+	!n32? ( !n64? ( sys-libs/libstdc++-v3 ) )"
 
 
 # <<--------------------SRC_URI variables-------------------->>
@@ -498,6 +499,20 @@ src_unpack() {
 	# misc patches that havent made it into a patch tarball yet
 	epatch ${FILESDIR}/3.4.0/gcc34-reiser4-fix.patch
 
+	# MIPS is screwed screwed thing - but it's cool!
+	# I had to add ABI variable, because during bootstrap
+	# USE flags get stripped. This doesn't make gcc happy.
+	# I'll take care of multilib when I actually decide to make it work.
+	# (That implied somebody has to add appropriate support to portage
+	# first).
+	if ! use multilib; then
+	    if [ "${ABI}" = "n32" ]; then
+		epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n32only.patch
+	    elif [ "${ABI}" = n64 ]; then
+		epatch ${FILESDIR}/3.4.1/gcc-3.4.1-mips-n64only.patch
+	    fi
+	fi
+
 	if use amd64 && use multilib ; then
 		# this should hack around the GCC_NO_EXECUTABLES bug
 		epatch ${FILESDIR}/3.4.1/gcc-3.4.1-glibc-is-native.patch
@@ -598,8 +613,8 @@ src_compile() {
 	case "${CCHOST}" in
 	    mips*)
 		use multilib && myconf="${myconf} --with-abi=32"
-		use n32 && myconf="${myconf} --with-abi=n32"
-		use n64 && myconf="${myconf} --with-abi=n64"
+		[ "${ABI}" = n32 ] && myconf="${myconf} --with-abi=n32"
+		[ "${ABI}" = n64 ] && myconf="${myconf} --with-abi=n64"
 	    ;;
 	esac