Allow gcc-mips64 to detect whether it's in a glibc or uclibc userland, and modify its CHOST accordingly.

(Portage version: 2.0.53)

3 files changed, 24 insertions, 10 deletions

diff --git a/sys-devel/gcc-mips64/ChangeLog b/sys-devel/gcc-mips64/ChangeLog
index e85228c8f6e0..cd63c2b8c990 100644
--- a/sys-devel/gcc-mips64/ChangeLog
+++ b/sys-devel/gcc-mips64/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2005/10/16 04:42:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-mips64/ChangeLog,v 1.14 2005/12/25 06:19:56 kumba Exp $
+
+  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
+  modify its CHOST accordingly.
 
 *gcc-mips64-3.4.4 (16 Oct 2005)
 
diff --git a/sys-devel/gcc-mips64/Manifest b/sys-devel/gcc-mips64/Manifest
index 79cdca9615a5..db02962f38b3 100644
--- a/sys-devel/gcc-mips64/Manifest
+++ b/sys-devel/gcc-mips64/Manifest
@@ -1,4 +1,4 @@
-MD5 a11b6eb55349d1f0889e35cbee226817 ChangeLog 2906
+MD5 cd19e9a29c2e31be4c61a3f39ff25853 ChangeLog 3089
 MD5 2ca380cbcf0547fb5d2a671c1c0296de files/digest-gcc-mips64-3.4.3-r1 64
 MD5 4b8b4306f268900392bbd0319bdfdf65 files/digest-gcc-mips64-3.4.4 64
 MD5 e411938ca2908079a2359fed5cb3b442 files/gcc-3.3.4-gentoo-branding.patch 874
@@ -6,5 +6,5 @@ MD5 1134e9dabbd6dfba1d91015851f02a2b files/gcc-3.4.2-mips-ip28_cache_barriers-v2
 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 3a64be2614c445cb7fb807a2b4d97b7f gcc-mips64-3.4.4.ebuild 3651
+MD5 8d5ca44717240a965715c4deaba915fb gcc-mips64-3.4.4.ebuild 3864
 MD5 efda60760635b5f29e31a8f730a73086 metadata.xml 364
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 e7ed598bdb28..57fb7d1d0215 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.1 2005/10/16 04:42:00 kumba Exp $
+# $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 $
 
 inherit eutils flag-o-matic
 
@@ -43,6 +43,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}
@@ -65,6 +74,7 @@ src_unpack() {
 }
 
 src_compile() {
+	local userland
 	cd ${WORKDIR}
 	ln -s ${TMP_P} ${P}
 
@@ -76,14 +86,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
@@ -113,8 +123,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() {
@@ -122,10 +132,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>"