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

Package-Manager: portage-2.0.53

3 files changed, 22 insertions, 21 deletions

diff --git a/sys-devel/gcc-powerpc64/ChangeLog b/sys-devel/gcc-powerpc64/ChangeLog
index 9e0496c02696..6e9181453583 100644
--- a/sys-devel/gcc-powerpc64/ChangeLog
+++ b/sys-devel/gcc-powerpc64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc-powerpc64
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-powerpc64/ChangeLog,v 1.2 2005/07/02 12:48:35 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-powerpc64/ChangeLog,v 1.3 2005/12/28 23:05:46 kumba Exp $
+
+  28 Dec 2005; Joshua Kinard <kumba@gentoo.org> gcc-powerpc64-3.4.4.ebuild:
+  Allow gcc-powerpc64 to detect whether it's in a glibc or uclibc userland,
+  and modify its CHOST accordingly.
 
 *gcc-powerpc64-3.4.4 (02 Jul 2005)
 
diff --git a/sys-devel/gcc-powerpc64/Manifest b/sys-devel/gcc-powerpc64/Manifest
index 6bd66b04d83f..4e1d07d9b9f8 100644
--- a/sys-devel/gcc-powerpc64/Manifest
+++ b/sys-devel/gcc-powerpc64/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fad162de8c9442c6924fb06cc3b24f92 ChangeLog 411
+MD5 5d6b51e0a5725cb0b3b15b5c58309f41 ChangeLog 597
 MD5 4b8b4306f268900392bbd0319bdfdf65 files/digest-gcc-powerpc64-3.4.4 64
-MD5 b8cb4b2e29d1b9eba51fc7bfe5268e97 gcc-powerpc64-3.4.4.ebuild 3294
+MD5 13cff8ced945869d44927b52daf57596 gcc-powerpc64-3.4.4.ebuild 3476
 MD5 b7f9c085d68ee4d2c8aaab58ef574457 metadata.xml 365
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0G/oI1lqEGTUzyQRAuJxAKCAHQZT5J90BYAv0mnj/DE00UtOmACfQlFR
-qxnELL3++pLlaq4IwjuVwzg=
-=MaVO
------END PGP SIGNATURE-----
diff --git a/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild b/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild
index 14f31ad1c522..0ed041a03a20 100644
--- a/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild
+++ b/sys-devel/gcc-powerpc64/gcc-powerpc64-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-powerpc64/gcc-powerpc64-3.4.4.ebuild,v 1.2 2005/07/10 00:46:18 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-powerpc64/gcc-powerpc64-3.4.4.ebuild,v 1.3 2005/12/28 23:05:46 kumba Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,7 +19,6 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${TMP_P}/${TMP_P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-
 IUSE=""
 
 KEYWORDS="ppc"
@@ -34,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"
@@ -44,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}
@@ -71,14 +78,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
@@ -108,8 +115,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() {
@@ -117,7 +124,7 @@ pkg_postinst() {
 	einfo "To facilitate an easier kernel build, you may wish to add the following line to your profile:"
 	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>"