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

(Portage version: 2.0.53)

4 files changed, 39 insertions, 26 deletions

diff --git a/sys-devel/gcc-sparc64/ChangeLog b/sys-devel/gcc-sparc64/ChangeLog
index 86b2d3153d16..f57c0df9c673 100644
--- a/sys-devel/gcc-sparc64/ChangeLog
+++ b/sys-devel/gcc-sparc64/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/gcc-sparc64
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/ChangeLog,v 1.26 2005/12/13 14:01:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/ChangeLog,v 1.27 2005/12/25 06:19:19 kumba Exp $
+
+  25 Dec 2005; Joshua Kinard <kumba@gentoo.org> gcc-sparc64-3.4.4.ebuild,
+  gcc-sparc64-3.4.5.ebuild:
+  Allow gcc-sparc64 to detect whether it's in a glibc or uclibc userland, and
+  modify its CHOST accordingly.
 
 *gcc-sparc64-3.4.5 (13 Dec 2005)
 
diff --git a/sys-devel/gcc-sparc64/Manifest b/sys-devel/gcc-sparc64/Manifest
index c6bf7443da7f..1f1d58a88a97 100644
--- a/sys-devel/gcc-sparc64/Manifest
+++ b/sys-devel/gcc-sparc64/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b3464183c41adaf61f02c40c9a820363 ChangeLog 4900
+MD5 6a0cba82f60b9f72845d4f94d275b06a ChangeLog 5113
 MD5 595fc5d3e417d76d1f7e7f0a8439535a files/digest-gcc-sparc64-3.3.5 64
 MD5 79ef0db9c6e9750aa92334dded832283 files/digest-gcc-sparc64-3.3.6 64
 MD5 4b8b4306f268900392bbd0319bdfdf65 files/digest-gcc-sparc64-3.4.4 64
@@ -10,13 +7,6 @@ MD5 5f8835c8de8d96466954796d2512a29b files/gcc-3.3.5-gentoo-branding.patch 874
 MD5 bffc563ab83f8025f3e477286ece2e65 files/gcc-3.3.6-gentoo-branding.patch 874
 MD5 374d4b109ffdf8a453c1400cd4ae92bb gcc-sparc64-3.3.5.ebuild 3001
 MD5 e6840b2edd483d96b07baa56e313af4c gcc-sparc64-3.3.6.ebuild 3002
-MD5 59debd5a0e1859a4413b867600761f2c gcc-sparc64-3.4.4.ebuild 3152
-MD5 643a1245b87190b6127fdf5e8163c8eb gcc-sparc64-3.4.5.ebuild 3154
+MD5 b81b1e23c705293ce074e2ae6c554608 gcc-sparc64-3.4.4.ebuild 3339
+MD5 f283873c7feee105980f6e23f007e49f gcc-sparc64-3.4.5.ebuild 3341
 MD5 f826fcca414fc0c05030db1f99e479d8 metadata.xml 360
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDntSFKRy60XGEcJIRAlEeAJ0V6/8MG+zYu9FN55aJvBRe+578AwCgn4zB
-QI4a99MxfL9tq6zCdE+l/TM=
-=FXev
------END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.4.4.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.4.4.ebuild
index 23d856758f52..73fb5d3f3af0 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.4.4.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-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-sparc64/gcc-sparc64-3.4.4.ebuild,v 1.1 2005/08/23 20:25:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.4.4.ebuild,v 1.2 2005/12/25 06:19:19 kumba Exp $
 
 inherit eutils flag-o-matic
 
@@ -41,6 +41,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}
@@ -68,14 +77,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
@@ -105,15 +114,15 @@ 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() {
 	einfo
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
 	einfo
-	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 "Then to compile a kernel, simply goto the kernel source directory, and issue:"
 	einfo "${MYARCH}make <target>"
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.4.5.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.4.5.ebuild
index 8e9eaf4b0001..c3a087d1c89a 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.4.5.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-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-sparc64/gcc-sparc64-3.4.5.ebuild,v 1.1 2005/12/13 14:01:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.4.5.ebuild,v 1.2 2005/12/25 06:19:19 kumba Exp $
 
 inherit eutils flag-o-matic
 
@@ -40,6 +40,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}
@@ -67,14 +76,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
@@ -104,15 +113,15 @@ 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() {
 	einfo
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
 	einfo
-	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 "Then to compile a kernel, simply goto the kernel source directory, and issue:"
 	einfo "${MYARCH}make <target>"