re-added uclibc patches and masked for testing. uses new toolchain.eclass

4 files changed, 35 insertions, 144 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 2fbb876c1334..b48ea22884df 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.322 2004/09/10 14:54:27 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.323 2004/09/12 17:44:43 lv Exp $
+
+*gcc-3.4.2-r1 (12 Sep 2004)
+
+  12 Sep 2004; Travis Tilley <lv@gentoo.org> +gcc-3.4.2-r1.ebuild,
+  -gcc-3.4.2.ebuild:
+  re-added uclibc patches and masked for testing
 
   10 Sep 2004; Travis Tilley <lv@gentoo.org> gcc-3.4.2.ebuild:
   updated ssp patch to 3.4.1-1. this version includes it's own documentation and
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7f0e00bad52b..4a7571821313 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,6 +1,6 @@
 MD5 99bd42b20f573db4f5dd176ec2fc8f08 gcc-3.3.2-r3.ebuild 20310
+MD5 fdf6561d2a79b49718b1e535e0767567 gcc-3.4.2-r1.ebuild 13821
 MD5 ebb324eea95cb2c6be9254a05a7ff815 gcc-3.2.3-r4.ebuild 19653
-MD5 438cf78d2c9ad2aba6cfe8f2e6fb99f7 gcc-3.4.2.ebuild 17461
 MD5 d3b281e2d3ff272a34d85f475452a668 gcc-3.3.3_pre20040408-r1.ebuild 22511
 MD5 9be02aa10d2d5643f3fb4f769345ecf9 gcc-3.3.ebuild 16522
 MD5 9d2f881e949534e2585b5b1e32b8edf9 gcc-3.1.1-r2.ebuild 9274
@@ -16,7 +16,7 @@ MD5 3f83a8d4f48a08c93928a74922eabaf0 gcc-3.3.2-r4.ebuild 20562
 MD5 2f2650284e244eafc0795b02a1bdadd2 gcc-2.95.3-r8.ebuild 8306
 MD5 192382b893da342324669e153371fd56 gcc-3.3.3-r3.ebuild 23575
 MD5 8dc61d014521e2c7e35e11b147a5be30 gcc-3.3.2-r1.ebuild 17783
-MD5 abf0029ff9a8ee4958d8d0772e5656e8 ChangeLog 66699
+MD5 2801094d1372aea39d59d80537651ca0 ChangeLog 66866
 MD5 c874c9694587097d692fa64cd46be416 gcc-3.3.2.ebuild 17730
 MD5 c45538377c4cf95b5e05fe3f3eaecc97 gcc-3.3.3_pre20040426.ebuild 22454
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
@@ -40,13 +40,13 @@ MD5 3a68d40d170427ffbfcf181b5099d693 files/digest-gcc-3.3.3-r5 528
 MD5 3fd5a29d44b89f4fb220fccaa968fc05 files/digest-gcc-3.3.3-r6 442
 MD5 6df16eb92245a931ecfc4cbcc73c84cf files/digest-gcc-3.3.4-r1 442
 MD5 c6ea8a92bac6d2638c54c011f98bc5b8 files/digest-gcc-3.4.1-r2 442
+MD5 3e2ed05a6d6829b70d282af8aa1fce82 files/digest-gcc-3.4.2-r1 358
 MD5 8f56750ce25ca30ffebcbdb65de95a1f files/digest-gcc-3.3.3_pre20040426 138
 MD5 8baffb486c75efe253bd2daa88daa7d6 files/gcc331_use_multilib.amd64.patch 352
 MD5 9bb4a999eb75c9e3eadab9aa71e91879 files/fix_libtool_files.sh 1731
 MD5 cf81ae4b2da79c34a005da1182c40134 files/digest-gcc-3.3.2 130
 MD5 35f63854b7b4d5ab1ed1489e517f8e24 files/digest-gcc-3.3.3 361
 MD5 fc48a7567c14adcfeed10b5e03b4ebf6 files/digest-gcc-3.4.1 355
-MD5 94bc047bdb8b8fcd860e9a984fdcff27 files/digest-gcc-3.4.2 358
 MD5 3213bd50acdbbd71ce7dd3e40710e30e files/digest-gcc-2.95.3-r8 64
 MD5 f57a9900e4d0edcae7b1e327e263d2f7 files/digest-gcc-3.3 294
 MD5 e3193bdffb435b77a21bfb504ff6f591 files/mkinfodir 7324
diff --git a/sys-devel/gcc/files/digest-gcc-3.4.2 b/sys-devel/gcc/files/digest-gcc-3.4.2-r1
index 249c311db12b..3d78b86acca9 100644
--- a/sys-devel/gcc/files/digest-gcc-3.4.2
+++ b/sys-devel/gcc/files/digest-gcc-3.4.2-r1
@@ -1,5 +1,5 @@
 MD5 2fada3a3effd2fd791df09df1f1534b3 gcc-3.4.2.tar.bz2 27246826
-MD5 acb6ad082175d5358ef53fd47e44c431 gcc-3.4.2-patches-1.0.tar.bz2 468293
 MD5 ccb950ac035c057bbc766426756072d2 protector-3.4.1-1.tar.gz 33860
 MD5 bdec16a59f044190fa51e28cae30da34 gcc-3.4.2-manpages.tar.bz2 202762
+MD5 1d077ca6b3119eecade935829b399f82 gcc-3.4.2-patches-1.1.tar.bz2 488213
 MD5 c6d950e8f61cbac4590061a116669b56 gcc-3.4.0-piepatches-v8.7.6.5.tar.bz2 16392
diff --git a/sys-devel/gcc/gcc-3.4.2.ebuild b/sys-devel/gcc/gcc-3.4.2-r1.ebuild
index ee564231135d..cc9c4283ac88 100644
--- a/sys-devel/gcc/gcc-3.4.2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.2-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/gcc-3.4.2.ebuild,v 1.5 2004/09/10 14:54:28 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.2-r1.ebuild,v 1.1 2004/09/12 17:44:43 lv Exp $
 
 IUSE="static nls bootstrap build nomultilib gcj gtk f77 objc hardened uclibc n32 n64"
 
@@ -10,8 +10,7 @@ DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie a
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 LICENSE="GPL-2 LGPL-2.1"
 
-#KEYWORDS="-* amd64 ~mips ~ppc64 ~x86 -hppa ~ppc"
-KEYWORDS="-*"
+KEYWORDS="-* ~amd64 ~mips ~ppc64 ~x86 -hppa ~ppc"
 
 # we need a proper glibc version for the Scrt1.o provided to the pie-ssp specs
 # we also need at least glibc 2.3.3 20040420-r1 in order for gcc 3.4 not to nuke
@@ -46,15 +45,16 @@ PDEPEND="sys-devel/gcc-config
 	!n32? ( !n64? ( !uclibc? ( !build ( sys-libs/libstdc++-v3 ) ) ) )"
 
 GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~lv/GCC/"
-PATCH_VER="1.0"
+PATCH_VER="1.1"
 PIE_VER="8.7.6.5"
 PIE_CORE="gcc-3.4.0-piepatches-v${PIE_VER}.tar.bz2"
 PP_VER="3_4_1"
 PP_FVER="${PP_VER//_/.}-1"
 SRC_URI="$(get_gcc_src_uri)"
-
 S="$(gcc_get_s_dir)"
 
+ETYPE="gcc-compiler"
+
 PIEPATCH_EXCLUDE="upstream/04_all_gcc-3.4.0-v8.7.6.1-pie-arm-uclibc.patch.bz2"
 HARDENED_GCC_WORKS="x86 sparc amd64"
 
@@ -78,7 +78,7 @@ HARDENED_GCC_WORKS="x86 sparc amd64"
 # problems.
 #
 # <azarah@gentoo.org> (13 Oct 2002)
-do_filter_flags() {
+gcc_do_filter_flags() {
 	strip-flags
 
 	# In general gcc does not like optimization, and add -O2 where
@@ -106,41 +106,6 @@ do_filter_flags() {
 	export GCJFLAGS="${CFLAGS}"
 }
 
-# Ok, this is a hairy one again, but lets assume that we
-# are not cross compiling, than we want SLOT to only contain
-# $PV, as people upgrading to new gcc layout will not have
-# their old gcc unmerged ...
-# GCC 3.4 introduces a new version of libstdc++
-if [ "${CHOST}" == "${CCHOST}" ]
-then
-	SLOT="3.4"
-else
-	SLOT="${CCHOST}-3.4"
-fi
-
-pkg_setup() {
-	gcc_setup_variables
-}
-
-check_option_validity() {
-	# Must compile for mips64-linux target if we want n32/n64 support
-	case "${CCHOST}" in
-		mips64-*)
-		;;
-		*)
-		    if use n32 || use n64; then
-		     eerror "n32/n64 can only be used when target host is mips64-*-linux-*";
-		     die "Invalid USE flags for CCHOST ($CCHOST)";
-		    fi
-		;;
-	esac
-
-	#cannot have both n32 & n64 without multilib
-	if use n32 && use n64 && use nomultilib; then
-		eerror "Please disable nomultilib if you want to use both n32 & n64";
-		die "Invalid USE flag combination";
-	fi
-}
 
 chk_gcc_version() {
 	# This next bit is for updating libtool linker scripts ...
@@ -184,87 +149,8 @@ src_unpack() {
 		autoreconf
 		cd ${S}
 	fi
-
-	# We dont want a multilib libjava, so lets use this hack taken from fedora
-	cd ${S}
-	sed -i -e 's/^all: all-redirect/ifeq (\$(MULTISUBDIR),)\nall: all-redirect\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
-	sed -i -e 's/^install: install-redirect/ifeq (\$(MULTISUBDIR),)\ninstall: install-redirect\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
-	sed -i -e 's/^check: check-redirect/ifeq (\$(MULTISUBDIR),)\ncheck: check-redirect\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
-	sed -i -e 's/^all: all-recursive/ifeq (\$(MULTISUBDIR),)\nall: all-recursive\nelse\nall:\n\techo Multilib libjava build disabled\nendif/' libjava/Makefile.in
-	sed -i -e 's/^install: install-recursive/ifeq (\$(MULTISUBDIR),)\ninstall: install-recursive\nelse\ninstall:\n\techo Multilib libjava install disabled\nendif/' libjava/Makefile.in
-	sed -i -e 's/^check: check-recursive/ifeq (\$(MULTISUBDIR),)\ncheck: check-recursive\nelse\ncheck:\n\techo Multilib libjava check disabled\nendif/' libjava/Makefile.in
 }
 
-src_compile() {
-
-	local myconf=
-
-	check_option_validity
-
-	if ! use build
-	then
-		GCC_LANG="c,c++"
-		use f77 && GCC_LANG="${GCC_LANG},f77"
-		use objc && GCC_LANG="${GCC_LANG},objc"
-		use gcj && GCC_LANG="${GCC_LANG},java"
-		# We do NOT want 'ADA support' in here!
-		# use ada  && gcc_lang="${gcc_lang},ada"
-	else
-		GCC_LANG="c"
-	fi
-
-	# GTK+ is preferred over xlib in 3.4.x (xlib is unmaintained
-	# right now). Much thanks to <csm@gnu.org> for the heads up.
-	# Travis Tilley <lv@gentoo.org>  (11 Jul 2004)
-	if ! use build && use gcj && use gtk
-	then
-		myconf="${myconf} --enable-java-awt=gtk"
-	fi
-
-	# Fix linking problem with c++ apps which where linked
-	# against a 3.2.2 libgcc
-	[ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions"
-
-	# Add --with-abi flags to enable respective MIPS ABIs
-	case "${CCHOST}" in
-	    mips*)
-		use !nomultilib && myconf="${myconf} --with-abi=32"
-		use n64 && myconf="${myconf} --with-abi=n64"
-		use n32 && myconf="${myconf} --with-abi=n32"
-	    ;;
-	esac
-
-	do_filter_flags
-	einfo "CFLAGS=\"${CFLAGS}\""
-	einfo "CXXFLAGS=\"${CXXFLAGS}\""
-	einfo "GCJFLAGS=\"${GCJFLAGS}\""
-
-	# Build in a separate build tree
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-
-	# Install our pre generated manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		unpack ${P}-manpages.tar.bz2 || die "Failed to unpack man pages"
-	fi
-
-	gcc_do_configure versioned ${myconf}
-
-	touch ${S}/gcc/c-gperf.h
-
-	# Do not make manpages if we do not have perl ...
-	if [ ! -x /usr/bin/perl ]
-	then
-		find ${WORKDIR}/build -name '*.[17]' -exec touch {} \; || :
-	fi
-
-	# Setup -j in MAKEOPTS
-	get_number_of_jobs
-
-	einfo "Building GCC..."
-	gcc_do_make
-}
 
 src_install() {
 	local x=
@@ -303,8 +189,8 @@ src_install() {
 	# directory, we will have to rename it in order to keep compatibility
 	# with our current libtool check and gcc-config (which would be a pain
 	# to fix compared to this simple mv and symlink).
-	mv ${D}/${LOC}/lib/gcc ${D}/${LOC}/lib/gcc-lib
-	ln -s gcc-lib ${D}/${LOC}/lib/gcc
+	mv ${D}/${PREFIX}/lib/gcc ${D}/${PREFIX}/lib/gcc-lib
+	ln -s gcc-lib ${D}/${PREFIX}/lib/gcc
 	LIBPATH=${LIBPATH/lib\/gcc/lib\/gcc-lib}
 
 	dodir /lib /usr/bin
@@ -321,10 +207,7 @@ src_install() {
 	else
 		LDPATH="${LIBPATH}"
 	fi
-	if [ "${BULIB}" != "" ]
-	then
-		LDPATH="${LDPATH}:${LOC}/lib/gcc-lib/${CCHOST}/${BULIB}"
-	fi
+
 	echo "LDPATH=\"${LDPATH}\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
 
 	echo "MANPATH=\"${DATAPATH}/man\"" >> ${D}/etc/env.d/gcc/${CCHOST}-${MY_PV_FULL}
@@ -351,40 +234,40 @@ src_install() {
 		done
 
 		# Move all the libraries to version specific libdir.
-		for x in ${D}${LOC}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
+		for x in ${D}${PREFIX}/lib/*.{so,a}* ${D}${LIBPATH}/../*.{so,a}*
 		do
 			[ -f "${x}" -o -L "${x}" ] && mv -f ${x} ${D}${LIBPATH}
 		done
 
 		# Move Java headers to compiler-specific dir
-		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
+		for x in ${D}${PREFIX}/include/gc*.h ${D}${PREFIX}/include/j*.h
 		do
 			[ -f "${x}" ] && mv -f ${x} ${D}${LIBPATH}/include/
 		done
 		for x in gcj gnu java javax org
 		do
-			if [ -d "${D}${LOC}/include/${x}" ]
+			if [ -d "${D}${PREFIX}/include/${x}" ]
 			then
 				dodir /${LIBPATH}/include/${x}
-				mv -f ${D}${LOC}/include/${x}/* ${D}${LIBPATH}/include/${x}/
-				rm -rf ${D}${LOC}/include/${x}
+				mv -f ${D}${PREFIX}/include/${x}/* ${D}${LIBPATH}/include/${x}/
+				rm -rf ${D}${PREFIX}/include/${x}
 			fi
 		done
 
-		if [ -d "${D}${LOC}/lib/security" ]
+		if [ -d "${D}${PREFIX}/lib/security" ]
 		then
 			dodir /${LIBPATH}/security
-			mv -f ${D}${LOC}/lib/security/* ${D}${LIBPATH}/security
-			rm -rf ${D}${LOC}/lib/security
+			mv -f ${D}${PREFIX}/lib/security/* ${D}${LIBPATH}/security
+			rm -rf ${D}${PREFIX}/lib/security
 		fi
 
 		# Move libgcj.spec to compiler-specific directories
-		[ -f "${D}${LOC}/lib/libgcj.spec" ] && \
-			mv -f ${D}${LOC}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
+		[ -f "${D}${PREFIX}/lib/libgcj.spec" ] && \
+			mv -f ${D}${PREFIX}/lib/libgcj.spec ${D}${LIBPATH}/libgcj.spec
 
 		# Rename jar because it could clash with Kaffe's jar if this gcc is
 		# primary compiler (aka don't have the -<version> extension)
-		cd ${D}${LOC}/${CCHOST}/gcc-bin/${MY_PV}
+		cd ${D}${PREFIX}/${CCHOST}/gcc-bin/${MY_PV}
 		[ -f jar ] && mv -f jar gcj-jar
 
 		# Move <cxxabi.h> to compiler-specific directories
@@ -407,15 +290,17 @@ src_install() {
 	fi
 
 	# This one comes with binutils
-	if [ -f "${D}${LOC}/lib/libiberty.a" ]
+	if [ -f "${D}${PREFIX}/lib/libiberty.a" ]
 	then
-		rm -f ${D}${LOC}/lib/libiberty.a
+		rm -f ${D}${PREFIX}/lib/libiberty.a
 	fi
 	if [ -f "${D}${LIBPATH}/libiberty.a" ]
 	then
 		rm -f ${D}${LIBPATH}/libiberty.a
 	fi
 
+	[ -e ${D}/${PREFIX}/lib/32 ] && rm -rf ${D}/${PREFIX}/lib/32
+
 	cd ${S}
 	if ! use build
 	then