new gcc; cleanups; fix gjc to be disabled

4 files changed, 417 insertions, 25 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 3f69b4a623eb..db3f09b907c3 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,9 +1,21 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.26 2002/07/28 03:36:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.27 2002/07/30 17:51:20 azarah Exp $
+
+*gcc-3.1.1-r1 (30 Jul 2002)
+
+  30 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.1.1-r1 :
+
+  Gcc-3.1.1 final.  Also fixed it to be able to disable java.
+  Major cleanups from 3.1.1.
 
 *gcc-3.2_pre (28 Jul 2002)
 
+  30 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2_pre :
+
+  Some cleanups.  Use the "java" USE flag to enable/disable java
+  as it add a bit to compile time.
+
   28 Jul 2002; Martin Schlemmer <azarah@gentoo.org> gcc-3.2_pre :
 
   Add CVS version of gcc-3.2.
diff --git a/sys-devel/gcc/files/digest-gcc-3.1.1-r1 b/sys-devel/gcc/files/digest-gcc-3.1.1-r1
new file mode 100644
index 000000000000..4306377f63b0
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.1.1-r1
@@ -0,0 +1,2 @@
+MD5 7269d2f24ab9188652ac17cd9545f511 gcc-3.1.1.tar.bz2 20515451
+MD5 0ff638960d988a20c1168f910059f961 gcc-3.1.1_final-patches-1.0.tbz2 29791
diff --git a/sys-devel/gcc/gcc-3.1.1-r1.ebuild b/sys-devel/gcc/gcc-3.1.1-r1.ebuild
new file mode 100644
index 000000000000..eea14df8111f
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.1.1-r1.ebuild
@@ -0,0 +1,352 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# /space/gentoo/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.1.ebuild,v 1.1 2002/05/17 15:42:30 prez Exp
+
+# NOTE TO MAINTAINER:  Info pages get nuked for multiple version installs.
+#                      Ill fix it later if i get a chance.
+#
+# IMPORTANT:  The versions of libs installed should be updated
+#             in src_install() ... Ill implement auto-version detection
+#             later on.
+
+inherit flag-o-matic libtool
+
+# Compile problems with these ...
+filter-flags "-fno-exceptions"
+
+MY_PV="`echo ${PV} | cut -d. -f1,2`"
+GCC_SUFFIX=-${MY_PV}
+LOC="/usr"
+# dont install in /usr/include/g++-v3/, as it will nuke gcc-3.0.x installs
+STDCXX_INCDIR="${LOC}/include/g++-v${MY_PV/\./}"
+PATCHES="${WORKDIR}/patches"
+S=${WORKDIR}/${P}
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2
+	http://www.ibiblio.org/gentoo/distfiles/${P}_final-patches-1.0.tbz2"
+DESCRIPTION="Modern GCC C/C++ compiler"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="${MY_PV}"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc
+	!build? ( >=sys-libs/ncurses-5.2-r2
+	          nls? ( sys-devel/gettext ) )"
+
+RDEPEND="virtual/glibc 
+	>=sys-libs/zlib-1.1.4
+	>=sys-apps/texinfo-4.2-r4
+	!build? ( >=sys-libs/ncurses-5.2-r2 )"
+
+build_multiple() {
+	#try to make sure that we should build multiple
+	#versions of gcc (dual install of gcc2 and gcc3)
+	profile="`readlink /etc/make.profile`"
+	# [ "`gcc -dumpversion | cut -d. -f1,2`" != "`echo ${PV} | cut -d. -f1,2`" ]
+	#
+	# Check the major and minor versions only, and drop the micro version.
+	# This is done, as compadibility only differ when major and minor differ.
+	if [ -z "`use build`" ] && \
+	   [ -z "`use bootstrap`" ] && \
+	   [ "`gcc -dumpversion | cut -d. -f1,2`" != "${MY_PV}" ] && \
+	   [ "${profile/gcc3}" = "${profile}" ] && \
+	   [ "${GCCBUILD}" != "default" ]
+	then
+		return 0
+	else
+		return 1
+	fi	  
+}
+
+# used to patch Makefiles to install into the build dir
+FAKE_ROOT=""
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+
+	mkdir -p ${WORKDIR}/patches
+	tar -jxf ${DISTDIR}/${P}_final-patches-1.0.tbz2 -C ${WORKDIR}/patches || \
+		die "Could not unpack patches"
+	
+	cd ${S}
+	# Fixup libtool to correctly generate .la files with portage
+	elibtoolize --portage --shallow
+
+	for x in ${PATCHES}/*.patch
+	do
+		# sad to say booboo I relised *after* uploading the patch to ibiblio :(
+		if [ "${x##*/}" = "28_gcc31-c++-diagnostic-no-line-wrapping.patch" ]
+		then
+			patch -p1 < ${x} || die "Failed with patch ${x##*/}"
+		else
+			patch -p0 < ${x} || die "Failed with patch ${x##*/}"
+		fi
+	done
+
+	# Currently if any path is changed via the configure script, it breaks
+	# installing into ${D}.  We should not patch it in src_install() with
+	# absolute paths, as some modules then gets rebuild with the wrong
+	# paths.  Thus we use $FAKE_ROOT.
+	cd ${S}
+	for x in $(find . -name Makefile.in)
+	do
+#		cp ${x} ${x}.orig
+		# Fix --datadir=
+#		sed -e 's:datadir = @datadir@:datadir = $(FAKE_ROOT)@datadir@:' \
+#			${x}.orig > ${x}
+		cp ${x} ${x}.orig
+		# Fix --with-gxx-include-dir=
+		sed -e 's:gxx_include_dir = @gxx_:gxx_include_dir = $(FAKE_ROOT)@gxx_:' \
+			-e 's:glibcppinstalldir = @gxx_:glibcppinstalldir = $(FAKE_ROOT)@gxx_:' \
+			${x}.orig > ${x}
+		rm -f ${x}.orig
+	done
+}
+
+src_compile() {
+	local myconf=""
+	local gcc_lang=""
+	if [ -z "`use build`" ]
+	then
+		myconf="${myconf} --enable-shared"
+		gcc_lang="c,c++,ada,f77,objc"
+	else
+		gcc_lang="c"
+	fi
+	if [ -z "`use nls`" ] || [ "`use build`" ]
+	then
+		myconf="${myconf} --disable-nls"
+	else
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	fi
+	if [ -n "`use java`" ] && [ -z "`use build`" ]
+	then
+		gcc_lang="${gcc_lang},java"
+	fi
+
+	#only build with a program suffix if it is not our
+	#default compiler.  Also check $GCCBUILD until we got
+	#compilers sorted out.
+	#
+	#NOTE:  for software to detirmine gcc version, it will be easier
+	#       if we have gcc, gcc-3.0 and gcc-3.1, and NOT gcc-3.0.4.
+	if build_multiple
+	then
+		myconf="${myconf} --program-suffix=${GCC_SUFFIX}"
+	fi
+
+	# gcc does not like optimization
+
+	export CFLAGS="${CFLAGS/-O?/}"
+	export CXXFLAGS="${CXXFLAGS/-O?/}"
+
+	#build in a separate build tree
+	mkdir -p ${WORKDIR}/build
+	cd ${WORKDIR}/build
+
+	addwrite "/dev/zero"
+	${S}/configure --prefix=${LOC} \
+		--mandir=${LOC}/share/man \
+		--infodir=${LOC}/share/info \
+		--enable-shared \
+		--host=${CHOST} \
+		--build=${CHOST} \
+		--target=${CHOST} \
+		--with-system-zlib \
+		--enable-languages=${gcc_lang} \
+		--enable-threads=posix \
+		--enable-long-long \
+		--disable-checking \
+		--enable-cstdio=stdio \
+		--enable-clocale=generic \
+		--enable-version-specific-runtime-libs \
+		--with-gxx-include-dir=${STDCXX_INCDIR} \
+		--with-local-prefix=${LOC}/local \
+		${myconf} || die
+
+	touch ${S}/gcc/c-gperf.h
+
+	if [ -z "`use static`" ]
+	then
+		#fix for our libtool-portage.patch
+		S="${WORKDIR}/build" \
+		emake bootstrap-lean || die
+	else
+		S="${WORKDIR}/build" \
+		emake LDFLAGS=-static bootstrap || die
+	fi
+}
+
+src_install() {
+	#make install from the build directory
+	cd ${WORKDIR}/build
+	S="${WORKDIR}/build" \
+	make prefix=${D}${LOC} \
+		mandir=${D}${LOC}/share/man \
+		infodir=${D}${LOC}/share/info \
+		FAKE_ROOT=${D} \
+		install || die
+	
+	if ! build_multiple
+	then
+		GCC_SUFFIX=""
+	fi
+
+	[ -e ${D}${LOC}/bin/gcc${GCC_SUFFIX} ] || die "gcc not found in ${D}"
+	
+	FULLPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV}
+	FULLPATH_D=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV}
+	cd ${FULLPATH_D}
+	dodir /lib
+	dodir /etc/env.d
+	echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc${GCC_SUFFIX}
+	if ! build_multiple
+	then
+		dosym /usr/bin/cpp /lib/cpp
+		dosym gcc /usr/bin/cc
+	fi
+
+	# gcc-3.1 have a problem with the ordering of Search Directories.  For
+	# instance, if you have libreadline.so in /lib, and libreadline.a in
+	# /usr/lib, then it will link with libreadline.a instead of .so.  As far
+	# as I can see from the source, /lib should be searched before /usr/lib,
+	# and this also differs from gcc-2.95.3 and possibly 3.0.4, but ill have
+	# to check on 3.0.4.  Thanks to Daniel Robbins for noticing this oddity,
+	# bugzilla bug #4411
+	#
+	# Azarah - 3 Jul 2002
+	#
+	cd ${FULLPATH_D}
+	dosed -e "s:%{L\*} %(link_libgcc):%{L\*} -L/lib %(link_libgcc):" \
+		${FULLPATH}/specs
+
+	#make sure we dont have stuff lying around that
+	#can nuke multiple versions of gcc
+	if [ -z "`use build`" ]
+	then
+		cd ${FULLPATH_D}
+
+		#Tell libtool files where real libraries are
+		for LA in ${D}${LOC}/lib/*.la ${FULLPATH_D}/../*.la
+		do
+			if [ -f ${LA} ]
+			then
+				sed -e "s:/usr/lib:${FULLPATH}:" ${LA} > ${LA}.hacked
+				mv ${LA}.hacked ${LA}
+				mv ${LA} ${FULLPATH_D}
+			fi
+		done
+
+		#move all the libraries to version specific libdir.
+		for x in ${D}${LOC}/lib/*.{so,a}* ${FULLPATH_D}/../*.{so,a}*
+		do
+			[ -f ${x} ] && mv -f ${x} ${FULLPATH_D}
+		done
+
+		#move Java headers to compiler-specific dir
+		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
+		do
+			[ -f ${x} ] && mv -f ${x} ${FULLPATH_D}/include/
+		done
+		for x in gcj gnu java javax org
+		do
+			if [ -d ${D}${LOC}/include/${x} ]
+			then
+				mkdir -p ${FULLPATH_D}/include/${x}
+				mv -f ${D}${LOC}/include/${x}/* ${FULLPATH_D}/include/${x}/
+				rm -rf ${D}${LOC}/include/${x}
+			fi
+		done
+
+		#move libgcj.spec to compiler-specific directories
+		[ -f ${D}${LOC}/lib/libgcj.spec ] && \
+			mv -f ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/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}/bin
+		[ -f jar${GCC_SUFFIX} ] && mv -f jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX}
+
+		#move <cxxabi.h> to compiler-specific directories
+		[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ] && \
+			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${FULLPATH_D}/include/
+
+		if build_multiple
+		then
+			#now fix the manpages
+			cd ${D}${LOC}/share/man/man1
+			mv cpp.1 cpp${GCC_SUFFIX}.1
+			mv gcov.1 gcov${GCC_SUFFIX}.1
+		fi
+	fi
+
+	#this one comes with binutils
+	if [ -f ${D}${LOC}/lib/libiberty.a ]
+	then
+		rm -f ${D}${LOC}/lib/libiberty.a
+	fi
+
+	cd ${S}
+    if [ -z "`use build`" ]
+    then
+		cd ${S}
+		docinto /	
+		dodoc COPYING COPYING.LIB ChangeLog LAST_UPDATED README MAINTAINERS
+		cd ${S}/boehm-gc
+		docinto boehm-gc
+		dodoc ChangeLog doc/{README*,barrett_diagram}
+		docinto boehm-gc/html
+		dohtml doc/*.html
+		cd ${S}/gcc
+		docinto gcc
+		dodoc ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS ONEWS \
+			README* SERVICE
+		cd ${S}/libf2c
+	    docinto libf2c
+	    dodoc ChangeLog README TODO changes.netlib disclaimer.netlib \
+			permission.netlib readme.netlib
+		cd ${S}/libffi
+	    docinto libffi
+	    dodoc ChangeLog* LICENSE README
+	    cd ${S}/libiberty
+	    docinto libiberty
+	    dodoc ChangeLog COPYING.LIB README
+	    cd ${S}/libobjc
+	    docinto libobjc
+	    dodoc ChangeLog README* THREADS*
+		cd ${S}/libstdc++-v3
+		docinto libstdc++-v3
+		dodoc ChangeLog* README
+		
+        if [ -n "`use java`" ]
+        then
+			cd ${S}/fastjar
+			docinto fastjar
+			dodoc AUTHORS CHANGES COPYING ChangeLog NEWS README
+			cd ${S}/libjava
+			docinto libjava
+			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
+        fi
+    else
+        rm -rf ${D}/usr/share/{man,info}
+	fi
+
+    # Fix ncurses b0rking
+    find ${D}/ -name '*curses.h' -exec rm -f {} \;
+}
+
+pkg_postrm() {
+	if [ ! -L ${ROOT}/lib/cpp ]
+	then
+		ln -sf /usr/bin/cpp ${ROOT}/lib/cpp
+	fi
+	if [ ! -L ${ROOT}/usr/bin/cc ]
+	then
+		ln -sf gcc ${ROOT}/usr/bin/cc
+	fi
+	
+	# Fix ncurses b0rking (if r5 isn't unmerged)
+	find ${ROOT}/usr/lib/gcc-lib -name '*curses.h' -exec rm -f {} \;
+}
+
diff --git a/sys-devel/gcc/gcc-3.2_pre.ebuild b/sys-devel/gcc/gcc-3.2_pre.ebuild
index 650605e7a5c3..d4bc9f14dabc 100644
--- a/sys-devel/gcc/gcc-3.2_pre.ebuild
+++ b/sys-devel/gcc/gcc-3.2_pre.ebuild
@@ -21,14 +21,16 @@ LOC="/usr"
 STDCXX_INCDIR="${LOC}/include/g++-v${MY_PV/\./}"
 PATCHES="${WORKDIR}/patches"
 SNAPSHOT="-20020728"
-SLOT="${MY_PV}"
 S=${WORKDIR}/${P/_pre}
 #SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2
 #	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/gcc/releases/${P}/${P}.tar.bz2"
 SRC_URI="http://www.ibiblio.org/gentoo/distfiles/${P/_pre}${SNAPSHOT}.tar.bz2"
 DESCRIPTION="Modern GCC C/C++ compiler"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+
+
 LICENSE="GPL-2 LGPL-2.1"
+SLOT="${MY_PV}"
 KEYWORDS="x86"
 
 DEPEND="virtual/glibc
@@ -92,17 +94,24 @@ src_unpack() {
 
 src_compile() {
 	local myconf=""
+	local gcc_lang=""
 	if [ -z "`use build`" ]
 	then
 		myconf="${myconf} --enable-shared"
+		gcc_lang="c,c++,ada,f77,objc"
 	else
-		myconf="${myconf} --enable-languages=c"
+		gcc_lang="c"
 	fi
-	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
+	if [ -z "`use nls`" ] || [ "`use build`" ]
+	then
 		myconf="${myconf} --disable-nls"
 	else
 		myconf="${myconf} --enable-nls --without-included-gettext"
 	fi
+	if [ -n "`use java`" ] && [ -z "`use build`" ]
+	then
+		gcc_lang="${gcc_lang},java"
+	fi
 
 	#only build with a program suffix if it is not our
 	#default compiler.  Also check $GCCBUILD until we got
@@ -133,6 +142,7 @@ src_compile() {
 		--build=${CHOST} \
 		--target=${CHOST} \
 		--with-system-zlib \
+		--enable-languages=${gcc_lang} \
 		--enable-threads=posix \
 		--enable-long-long \
 		--disable-checking \
@@ -217,34 +227,46 @@ src_install() {
 		done
 
 		#move all the libraries to version specific libdir.
-		mv ${D}${LOC}/lib/*.{so,a}* ${FULLPATH_D}/../*.{so,a}* \
-			${FULLPATH_D}
+		for x in ${D}${LOC}/lib/*.{so,a}* ${FULLPATH_D}/../*.{so,a}*
+		do
+			[ -f ${x} ] && mv -f ${x} ${FULLPATH_D}
+		done
 
 		#move Java headers to compiler-specific dir
-		mv ${D}${LOC}/include/gc*.h ${FULLPATH_D}/include/
-		mv ${D}${LOC}/include/j*.h ${FULLPATH_D}/include/
+		for x in ${D}${LOC}/include/gc*.h ${D}${LOC}/include/j*.h
+		do
+			[ -f ${x} ] && mv -f ${x} ${FULLPATH_D}/include/
+		done
 		for x in gcj gnu java javax org
 		do
-			mkdir -p ${FULLPATH_D}/include/${x}
-			mv ${D}${LOC}/include/${x}/* ${FULLPATH_D}/include/${x}/
-			rm -rf ${D}${LOC}/include/${x}
+			if [ -d ${D}${LOC}/include/${x} ]
+			then
+				mkdir -p ${FULLPATH_D}/include/${x}
+				mv -f ${D}${LOC}/include/${x}/* ${FULLPATH_D}/include/${x}/
+				rm -rf ${D}${LOC}/include/${x}
+			fi
 		done
 
 		#move libgcj.spec to compiler-specific directories
-		mv ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/libgcj.spec
+		[ -f ${D}${LOC}/lib/libgcj.spec ] && \
+			mv -f ${D}${LOC}/lib/libgcj.spec ${FULLPATH_D}/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}/bin
-		mv jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX}
+		[ -f jar${GCC_SUFFIX} ] && mv -f jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX}
 
 		#move <cxxabi.h> to compiler-specific directories
-		mv ${D}${STDCXX_INCDIR}/cxxabi.h ${FULLPATH_D}/include/
-
-		#now fix the manpages
-		cd ${D}${LOC}/share/man/man1;
-		mv cpp.1 cpp${GCC_SUFFIX}.1
-		mv gcov.1 gcov${GCC_SUFFIX}.1
+		[ -f ${D}${STDCXX_INCDIR}/cxxabi.h ] && \
+			mv -f ${D}${STDCXX_INCDIR}/cxxabi.h ${FULLPATH_D}/include/
+
+		if build_multiple
+		then
+			#now fix the manpages
+			cd ${D}${LOC}/share/man/man1
+			mv cpp.1 cpp${GCC_SUFFIX}.1
+			mv gcov.1 gcov${GCC_SUFFIX}.1
+		fi
 	fi
 
 	#this one comes with binutils
@@ -268,9 +290,6 @@ src_install() {
 		docinto gcc
 		dodoc ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS ONEWS \
 			README* SERVICE
-	    cd ${S}/fastjar
-	    docinto fastjar
-	    dodoc AUTHORS CHANGES COPYING ChangeLog NEWS README
 		cd ${S}/libf2c
 	    docinto libf2c
 	    dodoc ChangeLog README TODO changes.netlib disclaimer.netlib \
@@ -278,9 +297,6 @@ src_install() {
 		cd ${S}/libffi
 	    docinto libffi
 	    dodoc ChangeLog* LICENSE README
-		cd ${S}/libjava
-	    docinto libjava
-	    dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
 	    cd ${S}/libiberty
 	    docinto libiberty
 	    dodoc ChangeLog COPYING.LIB README
@@ -290,6 +306,16 @@ src_install() {
 		cd ${S}/libstdc++-v3
 		docinto libstdc++-v3
 		dodoc ChangeLog* README
+		
+        if [ -n "`use java`" ]
+        then
+			cd ${S}/fastjar
+			docinto fastjar
+			dodoc AUTHORS CHANGES COPYING ChangeLog NEWS README
+			cd ${S}/libjava
+			docinto libjava
+			dodoc ChangeLog* COPYING HACKING LIBGCJ_LICENSE NEWS README THANKS
+        fi
     else
         rm -rf ${D}/usr/share/{man,info}
 	fi