autodetect arch

Package-Manager: portage-2.2.0_alpha142
RepoMan-Options: --force

dev-libs/dietlibc/ChangeLog

@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Nov 2012; Mario Fetka <mario.fetka@gmail.com>
+  dietlibc-0.33_pre20120325.ebuild:
+  autodetect arch
+
   29 Nov 2012; Mario Fetka <mario.fetka@gmail.com>
   dietlibc-0.33_pre20120325.ebuild:
   add workaround for build and instally

dev-libs/dietlibc/Manifest

@@ -1,5 +1,5 @@
 DIST dietlibc_0.33~cvs20120325-3.debian.tar.gz 36857 SHA256 3abe1d5ed8721b54de5ea67fb8cb965ac428c1efaffe29e752f577f25b2667fa SHA512 4bb8a2548b5f0ae6afaba805789f8726d62a1e9a979a9d0c0ea799a96a748277fdacb1f5b7d4a37a640f7344734ef38673ec7d36820174dcb4a6649b10bda322 WHIRLPOOL 8b495ed9dd5b89f79ab94e573e34fe46686eda6fc0b38e5452cf35a8f42c4cd8bbd0c4609b1e7912fa08fdf752aa81ddd347b3f836f146e00d1b86591e30a027
 DIST dietlibc_0.33~cvs20120325.orig.tar.gz 726798 SHA256 6366f152587ba167e36ceec78cea505330c84750497aa6c8d853784abedae20a SHA512 618687d37300ecebfd3c1e315939ab05bd81372484a4f14d582a7e033a27ca498ddcd9472b41977a1830aa25aa03716f5c277e58bfa2cb2021758551a00e9f00 WHIRLPOOL 6fbdcd9b094a1137389a5380a25605f082349355f410d48b76117fc2b60ca2b790c717fe307c25df62e417b126de2abecdcb7b278e452ba9694d1fa16f291a2d
-EBUILD dietlibc-0.33_pre20120325.ebuild 1994 SHA256 e2415a85c9b7a666482afc71395e85acbdfcd5285f9ad73253386546b183951b SHA512 aed03638f9b745f7ca59237509cf8d812746086f2360de314ba4a4abdaebf606c0503db57b14b569b9c86422f2da43d7ad6c3b89f8bcded76bef359b53636037 WHIRLPOOL 61b6b487747c70feeddc7a88710dd0baa49dfa778ac7c60d53512ec5ed9cdfab14bf9fbfc34bb83f2e6b2a7006aa71ae77ff8468e1f0396498c6308bfd3a75fa
+EBUILD dietlibc-0.33_pre20120325.ebuild 2728 SHA256 08a8f964b48e09ff4ee7ec678119fe6ca45ce9b773ba8b4a63be9f652d26489a SHA512 7a11dd4988365fba597da1bc67dd64564a7f6c498bee28a3f5fdb464932d039264db0631503088695f57c096982f956943fd31114f2bd2d3e3f407c78af76a8f WHIRLPOOL 0959fe22c5405898af14c66f8dba782d059bae2b0992c10672c8d80376ac4bf64117dc6c49db836c51f197b89dc0f78df26c3111b67b8e5c6f71fb2c99cea6db
-MISC ChangeLog 437 SHA256 b339f5fa62c3f8856c7ce383fcc7781a5e0fe3e65e73bb807019c6e5347c9dae SHA512 db382d8b8bfcec6ffee8048dc78e9cce2119f4df2804d9619e0935cf5177c5814fe1e434521fd7ec28562f4c2d15828b8176bc0ee6875aca890b0fa3d069e35a WHIRLPOOL fedb856d8b26697ba68112cba8b83cfa678a2b43de48990f11b0c3b17437ec98ce4ab12e3688fb9eb57eef9e1b5bd8609bba2695ac0c2f41a296b652e737cdfa
+MISC ChangeLog 543 SHA256 1e5b46766ff361a2636035b0bf62d864f600aded5acbf7a0619ca7415115266f SHA512 41894cdfaca9cef8fa308c22da0da7af76a279892417740f555afa119959a21fceed0accaaff1868415c628a53a4ff4a615b1954b4ca53dbd0750f4210b99922 WHIRLPOOL 3cf58c211330d47d17bd06aa6bb351269513da9b775cb0789b5bca7facf13ed2063842c3d5b81f90c4e980c84edb7071a20d480119860169f0886d6df75e554e
 MISC metadata.xml 410 SHA256 3fc38345f9430d71c6369f84fc1b6248bc8aa0ec74cb4ae5b2797fe01cf48721 SHA512 d0819fcafbbc30e86adb68974c4bf0a09dc049a46a264647e05aa7b2f41543ac7c6fd0e206e73720404f0392cbd55b2736cbb54d63486882d439b8801a3b7547 WHIRLPOOL 1e559e60d0e43f84d18bac49ef2f338257d723fc4531d767c5f3d13511a790bbe94a93f0c60436aa86375cdb1df897e8e2fa58fc2cf8575b6a2da335721b6090

dev-libs/dietlibc/dietlibc-0.33_pre20120325.ebuild

@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/dietlibc_${MY_PV}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~arm"
+KEYWORDS="~alpha amd64 ~arm -hppa ~mips ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND=""
@@ -26,6 +26,12 @@ S="${WORKDIR}"/dietlibc-${MY_PV}
 
 DIETHOME=/usr/diet
 
+IUSE_LIBC_TARGET="alpha arm armeb i386 ia64 mips mipsel parisc parisc64 ppc ppc64 s390 s390x sparc sparc64 x86_64"
+
+for t in ${IUSE_LIBC_TARGET} ; do
+	IUSE="${IUSE} target_${t}"
+done
+
 pkg_setup() {
 	# Replace sparc64 related C[XX]FLAGS (see bug #45716)
 	use sparc && replace-sparc64-flags
@@ -36,6 +42,14 @@ pkg_setup() {
 	# debug flags
 	use debug && append-flags -g
 
+	dARCH=$(tc-ninja_magic_to_arch)
+	case ${dARCH} in
+		x86)	dARCH=i386
+		;;
+		amd64)	dARCH=x86_64
+		;;
+	esac
+
 	# Makefile does not append CFLAGS
 	append-flags -nostdinc -W -Wall -Wextra -Wchar-subscripts \
 		-Wmissing-prototypes -Wmissing-declarations -Wno-switch \
@@ -52,21 +66,42 @@ src_prepare() {
 }
 
 src_compile() {
-	emake prefix="${EPREFIX}"${DIETHOME} \
+	for t in ${IUSE_LIBC_TARGET} ; do
-		CC="$(tc-getCC)" \
+		use target_$t $USE || continue
-		CFLAGS="${CFLAGS}" \
+
-		STRIP=":" \
+		tC="CROSS_$t"
-		|| die "make failed"
+		if [ -z "${!tC}" ] ; then
+			ewarn "CROSS_$t not defined, can't build"
+			sleep 15
+			continue
+		fi
+
+		einfo "Building libc $t"
+		emake prefix="${EPREFIX}"${DIETHOME} \
+			MYARCH="${t}" \
+			CROSS="${!tC}" \
+			CFLAGS="${CFLAGS}" \
+			STRIP=":" \
+			|| die "make failed"
+	done
 }
 
 src_install() {
 	emake prefix="${EPREFIX}"${DIETHOME} \
 		DESTDIR="${D}" \
-		install-bin \
 		install-headers \
-		|| die "make install failed"
+		|| die "make install-headers failed"
-	# broken so add a workaround
+
-	ln -sf bin-${ARCH} ${DIETHOME}/bin-${CHOST/-*/}
+	for t in ${IUSE_LIBC_TARGET} ; do
+		use target_$t $USE || continue
+
+		einfo "Installing libc $t"
+		emake prefix=${DIETHOME} \
+			MYARCH="${t}" \
+			DESTDIR="${D}" \
+			install-bin \
+			|| die "make install-bin failed"
+	done
 
 	dobin "${ED}"${DIETHOME}/bin/* || die "dobin failed"
 	doman "${ED}"${DIETHOME}/man/*/* || die "doman failed"