Import 3.4.5 for gcc-mips64; remove 3.4.3-r1 and mark 3.4.4 as stable. This will probably be the last release of gcc-mips64. sys-devel/kgcc64 will deprecate this and other arch-specific kernel compilers.

(Portage version: 2.0.53)

6 files changed, 44 insertions, 27 deletions

diff --git a/sys-devel/gcc-mips64/ChangeLog b/sys-devel/gcc-mips64/ChangeLog
index cd63c2b8c990..1a8bfd8ea120 100644
--- a/sys-devel/gcc-mips64/ChangeLog
+++ b/sys-devel/gcc-mips64/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-devel/gcc-mips64
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/ChangeLog,v 1.14 2005/12/25 06:19:56 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/ChangeLog,v 1.15 2005/12/25 06:26:22 kumba Exp $
+
+*gcc-mips64-3.4.5 (25 Dec 2005)
+
+  25 Dec 2005; Joshua Kinard <kumba@gentoo.org> -gcc-mips64-3.4.3-r1.ebuild,
+  gcc-mips64-3.4.4.ebuild, +gcc-mips64-3.4.5.ebuild:
+  Import 3.4.5 for gcc-mips64; remove 3.4.3-r1 and mark 3.4.4 as stable. This
+  will probably be the last release of gcc-mips64. sys-devel/kgcc64 will
+  deprecate this and other arch-specific kernel compilers.
 
   25 Dec 2005; Joshua Kinard <kumba@gentoo.org> gcc-mips64-3.4.4.ebuild:
   Allow gcc-mips64 to detect whether it's in a glibc or uclibc userland, and
diff --git a/sys-devel/gcc-mips64/Manifest b/sys-devel/gcc-mips64/Manifest
index 5a77a393785d..6da763e9d243 100644
--- a/sys-devel/gcc-mips64/Manifest
+++ b/sys-devel/gcc-mips64/Manifest
@@ -1,10 +1,10 @@
-MD5 8c917397140708ffa7a7ebc1850fa8a7 ChangeLog 3089
-MD5 2ca380cbcf0547fb5d2a671c1c0296de files/digest-gcc-mips64-3.4.3-r1 64
+MD5 79b15651e154458b52c7ff71dfbff081 ChangeLog 3463
 MD5 4b8b4306f268900392bbd0319bdfdf65 files/digest-gcc-mips64-3.4.4 64
+MD5 ba0f5e25062066184f3513100252770f files/digest-gcc-mips64-3.4.5 64
 MD5 e411938ca2908079a2359fed5cb3b442 files/gcc-3.3.4-gentoo-branding.patch 874
 MD5 1134e9dabbd6dfba1d91015851f02a2b files/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch 14118
 MD5 f3a1b668077c6486c542dcef1cdd9672 files/gcc-3.4.2-mips-ip28_cache_barriers.patch 12545
 MD5 b2922cfe76692e7d2b373a0a255f405e files/gcc-3.4.x-mips-add-march-r10k.patch 14248
-MD5 e4b8145c02cf6a3eaa55f97f715d9677 gcc-mips64-3.4.3-r1.ebuild 3578
-MD5 1adc04d84f41f51b56814894bbf553f9 gcc-mips64-3.4.4.ebuild 3864
+MD5 1c8ee184dfac269b1a098e64ae9d586b gcc-mips64-3.4.4.ebuild 3862
+MD5 663fb7b79394ac898a02d9fbb94216db gcc-mips64-3.4.5.ebuild 3851
 MD5 efda60760635b5f29e31a8f730a73086 metadata.xml 364
diff --git a/sys-devel/gcc-mips64/files/digest-gcc-mips64-3.4.3-r1 b/sys-devel/gcc-mips64/files/digest-gcc-mips64-3.4.3-r1
deleted file mode 100644
index a7535796098b..000000000000
--- a/sys-devel/gcc-mips64/files/digest-gcc-mips64-3.4.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e744b30c834360fccac41eb7269a3011 gcc-3.4.3.tar.bz2 27425338
diff --git a/sys-devel/gcc-mips64/files/digest-gcc-mips64-3.4.5 b/sys-devel/gcc-mips64/files/digest-gcc-mips64-3.4.5
new file mode 100644
index 000000000000..ded991406cd1
--- /dev/null
+++ b/sys-devel/gcc-mips64/files/digest-gcc-mips64-3.4.5
@@ -0,0 +1 @@
+MD5 7c3c3c3e764dcee5eb771432062d69e1 gcc-3.4.5.tar.bz2 28254232
diff --git a/sys-devel/gcc-mips64/gcc-mips64-3.4.4.ebuild b/sys-devel/gcc-mips64/gcc-mips64-3.4.4.ebuild
index 57fb7d1d0215..a0ef3442ec99 100644
--- a/sys-devel/gcc-mips64/gcc-mips64-3.4.4.ebuild
+++ b/sys-devel/gcc-mips64/gcc-mips64-3.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/gcc-mips64-3.4.4.ebuild,v 1.2 2005/12/25 06:19:56 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/gcc-mips64-3.4.4.ebuild,v 1.3 2005/12/25 06:26:22 kumba Exp $
 
 inherit eutils flag-o-matic
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="~mips"
+KEYWORDS="mips"
 
 DEPEND="virtual/libc
 	>=sys-devel/binutils-2.14.90.0.7
@@ -33,7 +33,6 @@ RDEPEND="virtual/libc
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 
-
 # Ripped from toolchain.eclass
 gcc_version_patch() {
 	[ -z "$1" ] && die "no arguments to gcc_version_patch"
diff --git a/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild b/sys-devel/gcc-mips64/gcc-mips64-3.4.5.ebuild
index 2c8416853a45..a87f4cbf85a3 100644
--- a/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild
+++ b/sys-devel/gcc-mips64/gcc-mips64-3.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/gcc-mips64-3.4.3-r1.ebuild,v 1.4 2005/07/10 00:48:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/gcc-mips64-3.4.5.ebuild,v 1.1 2005/12/25 06:26:22 kumba Exp $
 
 inherit eutils flag-o-matic
 
@@ -9,10 +9,10 @@ MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
 I="/usr"
-IUSE="ip28"
+IUSE=""
 BRANCH_UPDATE=""
 
-DESCRIPTION="Mips64 Kernel Compiler (Experimental)"
+DESCRIPTION="Mips64 Kernel Compiler"
 HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
 
 SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
@@ -21,19 +21,18 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-KEYWORDS="mips"
+KEYWORDS="~mips"
 
 DEPEND="virtual/libc
-	>=sys-devel/binutils-2.14.90.0.7
-	>=sys-devel/gcc-config-1.3.1"
+	>=sys-devel/binutils-2.16.1
+	>=sys-devel/gcc-config-1.3.12-r4"
 
 RDEPEND="virtual/libc
-	>=sys-devel/gcc-config-1.3.1
+	>=sys-devel/gcc-config-1.3.12-r4
 	>=sys-libs/zlib-1.1.4
 	>=sys-apps/texinfo-4.2-r4
 	!build? ( >=sys-libs/ncurses-5.2-r2 )"
 
-
 # Ripped from toolchain.eclass
 gcc_version_patch() {
 	[ -z "$1" ] && die "no arguments to gcc_version_patch"
@@ -43,6 +42,15 @@ gcc_version_patch() {
 	sed -i -e 's~http:\/\/gcc\.gnu\.org\/bugs\.html~http:\/\/bugs\.gentoo\.org\/~' ${S}/gcc/version.c || die "failed to update bugzilla URL"
 }
 
+pkg_setup() {
+	# glibc or uclibc?
+	if use elibc_glibc; then
+		MYUSERLAND="gnu"
+	elif use elibc_uclibc; then
+		MYUSERLAND="uclibc"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}
@@ -54,16 +62,18 @@ src_unpack() {
 		epatch ${WORKDIR}/${TMP_P}-branch-update-${BRANCH_UPDATE}.patch
 	fi
 
-	# If on an IP28 box (set by profile), then add in cache barrier patch
-	if use ip28; then
-		epatch ${FILESDIR}/gcc-3.4.2-mips-ip28_cache_barriers.patch
-	fi
+	# Adds -march=r10000 support to gcc
+	epatch ${FILESDIR}/gcc-3.4.x-mips-add-march-r10k.patch
+
+	# Allows building of kernels for IP28 systems (enable w/ -mip28-cache-barrier)
+	epatch ${FILESDIR}/gcc-3.4.2-mips-ip28_cache_barriers-v2.patch
 
 	# Make gcc's version info specific to Gentoo
 	gcc_version_patch "(Gentoo Linux ${PVR})"
 }
 
 src_compile() {
+	local userland
 	cd ${WORKDIR}
 	ln -s ${TMP_P} ${P}
 
@@ -75,14 +85,14 @@ src_compile() {
 
 	einfo "Configuring GCC..."
 	if [ "`uname -m | grep 64`" ]; then
-		myconf="${myconf} --host=${MYARCH/64/}-unknown-linux-gnu"
+		myconf="${myconf} --host=${MYARCH/64/}-unknown-linux-${MYUSERLAND}"
 	fi
 
 	addwrite "/dev/zero"
 	${S}/configure --prefix=${I} \
 		--disable-shared \
 		--disable-multilib \
-		--target=${MYARCH}-unknown-linux-gnu \
+		--target=${MYARCH}-unknown-linux-${MYUSERLAND} \
 		--enable-languages=c \
 		--enable-threads=single \
 		${myconf} || die
@@ -112,8 +122,8 @@ src_install() {
 		install || die
 
 	cd ${D}${I}/bin
-	ln -s ${MYARCH}-unknown-linux-gnu-gcc gcc64
-	ln -s ${MYARCH}-unknown-linux-gnu-gcc ${MYARCH}-linux-gcc
+	ln -s ${MYARCH}-unknown-linux-${MYUSERLAND}-gcc gcc64
+	ln -s ${MYARCH}-unknown-linux-${MYUSERLAND}-gcc ${MYARCH}-linux-gcc
 }
 
 pkg_postinst() {
@@ -121,10 +131,10 @@ pkg_postinst() {
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
 	einfo
 	einfo "For 2.4.x kernel builds:"
-	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH} CROSS_COMPILE=${MYARCH}-unknown-linux-gnu-\""
+	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH} CROSS_COMPILE=${MYARCH}-unknown-linux-${MYUSERLAND}-\""
 	einfo
 	einfo "For 2.6.x kernel builds:"
-	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH/64/} CROSS_COMPILE=${MYARCH}-unknown-linux-gnu-\""
+	einfo "alias ${MYARCH}make=\"make ARCH=${MYARCH/64/} CROSS_COMPILE=${MYARCH}-unknown-linux-${MYUSERLAND}-\""
 	einfo
 	einfo "Then to compile a kernel, simply goto the kernel source directory, and issue:"
 	einfo "${MYARCH}make <target>"