Drop cpu selection for most targets since it is either pointless (does nothing) or just changes optimization flags.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 42 insertions, 75 deletions

diff --git a/sys-libs/uclibc/ChangeLog b/sys-libs/uclibc/ChangeLog
index e5c75f8ba8bf..998ee04d0806 100644
--- a/sys-libs/uclibc/ChangeLog
+++ b/sys-libs/uclibc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/uclibc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.75 2013/05/07 16:50:58 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/ChangeLog,v 1.76 2013/05/19 05:36:27 vapier Exp $
+
+  19 May 2013; Mike Frysinger <vapier@gentoo.org> uclibc-9999.ebuild:
+  Drop cpu selection for most targets since it is either pointless (does
+  nothing) or just changes optimization flags.
 
   07 May 2013; Anthony G. Basile <blueness@gentoo.org>
   uclibc-0.9.33.2-r3.ebuild, uclibc-9999.ebuild:
diff --git a/sys-libs/uclibc/Manifest b/sys-libs/uclibc/Manifest
index 085a4e4534b3..489f7e78c4f0 100644
--- a/sys-libs/uclibc/Manifest
+++ b/sys-libs/uclibc/Manifest
@@ -26,23 +26,23 @@ EBUILD uclibc-0.9.33.2-r1.ebuild 10638 SHA256 b3c450389a1c396563382e8061fa206bae
 EBUILD uclibc-0.9.33.2-r2.ebuild 10631 SHA256 08f05130b3b7b7df2f0a0bb3330e2599132e872f2e38fe9f9b3586df6a180deb SHA512 a5fa061a09d21aa5d743d5d118e2a60357eff384a959e4e099d9056c557fd2f3d995dd79b01c25e7cd905ff66836e2a540b14a1fd6fcf9229db441763c9d17f5 WHIRLPOOL 60f695ca98a92f99618c4bd1c5adc68527c407c30b9ef22a83aafa9372ff16f4e6f67821cbd5aa48bae8d327e9d16c6ac5d5cb5fe39819f04ba492b1d13a9a72
 EBUILD uclibc-0.9.33.2-r3.ebuild 10768 SHA256 5efe6a51165a63f7821accf3dd4b09ffed5e0729c965cac560075e6df2e90480 SHA512 5179bcee9831d3d61cbd9fbeeaa615bc7bd71c5c7d81ba2e107bfe65503439ec3a166ed91f3112ee33fea63a53b2505d95795c8fcf94d666373e3e1e918e52ef WHIRLPOOL e9b20565a20bd6e8a6c9c17168629cb885c40a5b9d246d4656c363eee654b4aeda621c81e552fa36ab1cc0292a24a709d0c9cb99d21c30a1952f9f44f5594878
 EBUILD uclibc-0.9.33.2.ebuild 10630 SHA256 db49c741a424d2433ec3978184c979b2a9fcb903f83eeb110adcec76940b342e SHA512 75e974586c57662f2f39d6a80a1162ec611b31b4dfa881a2ab2094f6b35c6b9375c98a53c957580395b4754cc8c27b4a53737b6d9a0f099ab4a3c45ae1169125 WHIRLPOOL 9f8f01465c556c372d926e701abef49770c1772b40ad83325439343d22561a4b1f4cf6c9bcdba78815f2e8af11d3455deee3dd81225c54b83de3dd132e2462c9
-EBUILD uclibc-9999.ebuild 10767 SHA256 f74b7a78848e599bf1aea691cd86b7856b703c41d10313b93de1070d3f763587 SHA512 e057691e210dd1632720547ba9fe0927211983ad80fcf4d5f44044fff378f82a342117f999f624a04bcfef7db8d5410738be1ba0104307eb2e68ed6717ec778b WHIRLPOOL 62faa118bdeef17d9603888e1dec0c44d77002197cc6f5d860acf3ddba48e962f1968b3b75869141a4e27425c0dbf44ab6b88ab0b40882a160400eabd8d4d784
-MISC ChangeLog 21327 SHA256 e8e81ae566b16d628d208b920fe82e27607ddfda139218332b8eedd772afc801 SHA512 c33352f847ed73499eb276d725acb33bd72dd4cd9c49d464cc18de7d0db22d9316edfe3d96c3e2ff804484cd26d124642846cf077962cee506f77ff70fe4df4e WHIRLPOOL 989134a3fb2acb39cbf72f169cad74dca3739b98660e7e3861ad49ed8428984c89b448116b4366f5f11eccf92015c2730c72b485e85281731673a350ca7551a9
+EBUILD uclibc-9999.ebuild 9108 SHA256 ddeff7104340a8a5c5bd46dbe44d27cc000bb84899b089ba530210e55cf6f9de SHA512 fa14dcf54ea00811d87d04aa1c47230b6181268de53c545532ec44e412c45166cf9f32c0aa70dfa10841ed32ed5de1ba73eab2ac870ba60c259fda78cd5fccd5 WHIRLPOOL 8e63062268e7d87c03c05a025f894f9a7acd5711c0bec199dbe98cacb88391db8758a137804a0cc43f48b65aad6d288cd2b3744ecd5a23b6779ee735f6e61388
+MISC ChangeLog 21516 SHA256 b987fda30e775ebcc60a5e5ea9f1c61e022c9c7dc1529c44ae830acbe76ae6d1 SHA512 4b80b91d18e4818cb162c9b922f4658b0fd82925cc44105a6c85a1948a1659336277c320db3c2f74973591c5b9bfa1c2ffc7c22d3ab22a688d952f5e67694241 WHIRLPOOL cdda0e5a7db9bb06533a06757e54cc8d06132d2c167f806fb768796f64796e02d8da301c8865a0250ed2c47f278784582fc0eeba75bb150999e7905be4e935a3
 MISC metadata.xml 1435 SHA256 cd15ca4d65ec270c128fb37bd2c489b6e83c566203028cc8ecf9a90bea9c071d SHA512 84b5c8b1afe189587178d7736c3fca20b8079cf5ab666d524962e104a0a531de3fe39bdb2d3b69e4a77c322b8392fe7df292ea50ff89d80f99201aef1a12bc2b WHIRLPOOL 1e93f7bf529709eea2a8dfa81737bff41d22bd8af35ed562f06479f337b53ddc7aedd362c91f8361016c462edb5e8007586a7fde7f960fd4b7b88eff02c42e81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRiTD1AAoJEJOE+m71LUu6iPkP/iV5GDPRFV/S5N0xpUCDHMu1
-UXif3uOOe/rI/kCpZzf4UTy7UsD9buFCXdP7MqY0zQ5tsuYclZ82/mSaqNHuYTqD
-/9ziVyfUlyvGUKZBL6LAlr9lS/twpNBje5e5Rj7rZknvMg34C3UnJyk93AP8o5fO
-y6hJ//OD4LdY7+UBU16E+jCxAvekxKmexj50awjM9m57SUTxx+uzu47qCDDhspPI
-zf8dcS+XHH8VIcLpsjPrnZdYDLWkobqlr72Q9IpK5aBfYyiUV13KgoqoEYWPy40f
-/qxpz5jjzrDa+YrOwVALP6EQga7/X5f7MJYnRQobriBfM5vgZUHvuoja4JahWqll
-jpQhAUWP2rbly9ey32w7F8aYkerJNh/qYub59pgtaAq1cDjLsdfv9o3k4zVVaOf6
-PqG6d0IA0dwih3BdbuEyU5Cp1FIbX/4/WSoYreU+FFs3lXp7nxggowewvVEhXD4S
-RgMUGBHf0tN/okhU1hqlBdxTpONN3H/anOE1ksv97IlrRcCQ+YYAOEVDqiuGEszI
-rm5nGbD4KukZ5SMgDMn1nuB3I3z3ykI+pIeRICitdBoSKOwtXMfCXj1kQbTuXVfS
-+i+64NvJyQrmhQaCKCOTnre6e0qSW/bQuYFmIudw6gmVlnmqGaKm4kqZvzk0q3Cy
-+4btJDWGmX/BSpBPNLMO
-=eZKV
+iQIcBAEBCAAGBQJRmGTkAAoJELEHsLL7fEFWlIsP/3Rx6WChFMUtwiPLJygKP/5j
+QmNLgJL0aed0LFuznkOJhpkBrrIGXXgzjFvvjnsRVb3HbHqkiZH4j2enE6RxwJyy
+ym8/TYLGdXlxKLmgRQXQev+kZwwCj88GXjyBd5W26NfD8Hh/RNFiOo3GKzWO0bsZ
+KLzCzfcGCfit0gw2EGS+Q/q+PqB/eCj3zt1jeQLxZnlFV17X6o/i1r9Paew7N7wp
+Y87xzifxXWQ0D9HGH/weg4jnwtCAiVizFDxdQXaVTndYyaPhqUcFlgZGb3ZDGiU6
+fqVm7FrD4A41EBWYOaoMDcPsTOKOf5orY3tPrXOqH6kJLazhiAPaAmQVdMWyy/xf
+J8vS0o2j3gOteM4g9NkvB9KxTKAOb6fVP9p2cntbYPaJ/ruiqyUTAnMIr1AmSlEE
+7I+1/LB9bEV297+pgCJcXF3iFCo3AoeMno7eg4c5fQCXbftBYUGr7r625G/xFxE2
+7XS0AfbyzRCBbih3fdfj9suOfyLj8rHvwpnMRu666ujAMKsG2TMSa5+cdEV5ANE8
+ntTXVFMuZEhU00fYqWHnOSPLanm6h459qPVBouWlxm+jCXZhDimJG1P7T5SKeOtP
+8duQO635CxRQo8W7++IDaNaJReFkdjJoKVFuRtk1Pr0HZJ58sl4iZyd7lBKbeLsj
+YUdNwHk8DABHWnn0rnwj
+=Ntk7
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/uclibc/uclibc-9999.ebuild b/sys-libs/uclibc/uclibc-9999.ebuild
index a5bc2385e779..6a64ad13aea8 100644
--- a/sys-libs/uclibc/uclibc-9999.ebuild
+++ b/sys-libs/uclibc/uclibc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v 1.5 2013/05/07 16:50:58 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc/uclibc-9999.ebuild,v 1.6 2013/05/19 05:36:27 vapier Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs savedconfig
 if [[ ${PV} == "9999" ]] ; then
@@ -62,7 +62,7 @@ uclibc_endian() {
 }
 
 pkg_setup() {
-	if [ ${CTARGET} == ${CHOST} ] ; then
+	if [ ${CTARGET} = ${CHOST} ] ; then
 		case ${CHOST} in
 		*-uclinux*|*-uclibc*) ;;
 		*) die "Use sys-devel/crossdev to build a uclibc toolchain" ;;
@@ -70,47 +70,14 @@ pkg_setup() {
 	fi
 }
 
-# XXX: We should kill these off.
-CPU_ALPHA=""
-CPU_AMD64=""
-CPU_ARM="GENERIC_ARM ARM{610,710,7TDMI,720T,920T,922T,926T,10T,1136JF_S,1176JZ{_,F_}S,_{SA110,SA1100,XSCALE,IWMMXT},_CORTEX_{M3,M1}}"
-CPU_IA64=""
-CPU_M68K=""
-CPU_MIPS="MIPS_ISA_{1,2,3,4,MIPS{32{,R2},64}} MIPS_{N64,O32,N32}_ABI"
-CPU_PPC=""
-CPU_SH="SH{2,2A,3,4,5}"
-CPU_SPARC="SPARC_V{7,8,9,9B}"
-CPU_X86="GENERIC_386 {3,4,5,6}86 586MMX PENTIUM{II,III,4} K{6,7} ELAN CRUSOE WINCHIP{C6,2} CYRIXIII NEHEMIAH"
-IUSE_UCLIBC_CPU="${CPU_ARM} ${CPU_MIPS} ${CPU_PPC} ${CPU_SH} ${CPU_SPARC} ${CPU_X86}"
-
 check_cpu_opts() {
-	local cpu_var="CPU_$(echo $(tc-arch) | tr [a-z] [A-Z])"
-	[[ -z ${!cpu_var} ]] && return 0
-
-	if [[ -z ${UCLIBC_CPU} ]] ; then
-		ewarn "You really should consider setting UCLIBC_CPU"
-		ewarn "Otherwise, the build will be generic (read: slow)."
-		ewarn "Available CPU options:"
-		UCLIBC_CPU=$(eval echo ${!cpu_var})
-		echo ${UCLIBC_CPU}
-		case ${CTARGET} in
-			mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
-			sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
-			i[456]86*)   export UCLIBC_CPU="${CTARGET:1:1}86";;
-			*)           export UCLIBC_CPU=${UCLIBC_CPU%% *};;
-		esac
-	else
-		local cpu found=0
-		for cpu in $(eval echo ${!cpu_var}) ; do
-			[[ ${UCLIBC_CPU} == "${cpu}" ]] && found=1 && break
-		done
-		if [[ ${found} -eq 0 ]] ; then
-			ewarn "UCLIBC_CPU choice '${UCLIBC_CPU}' not supported"
-			ewarn "Valid choices:"
-			eval echo ${!cpu_var}
-			die "pick a supported cpu type"
-		fi
-	fi
+	case ${CTARGET} in
+	# Need to handle $ABI here w/mips.
+	mips[1234]*) export UCLIBC_CPU="MIPS_ISA_${CTARGET:4:1}";;
+	sh[2345]*)   export UCLIBC_CPU="SH${CTARGET:2:1}";;
+	i[3456]86*)  export UCLIBC_CPU="${CTARGET:1:1}86";;
+	# XXX: Should figure out how to handle sparc.
+	esac
 }
 
 kconfig_q_opt() {
@@ -277,24 +244,20 @@ src_unpack() {
 
 	########## CPU SELECTION ##########
 
-	local target config_target
-	case $(tc-arch) in
-		alpha) target="alpha";   config_target="no cpu-specific options";;
-		amd64) target="x86_64";  config_target="no cpu-specific options";;
-		arm)   target="arm";     config_target="GENERIC_ARM";;
-		avr)   target="avr32";   config_target="no cpu-specific options";;
-		bfin)  target="bfin";    config_target="no cpu-specific options";;
-		ia64)  target="ia64";    config_target="no cpu-specific options";;
-		m68k)  target="m68k";    config_target="no cpu-specific options";;
-		mips)  target="mips";    config_target="MIPS_ISA_1";;
-		ppc)   target="powerpc"; config_target="no cpu-specific options";;
-		sh)    target="sh";      config_target="SH4";;
-		sparc) target="sparc";   config_target="no cpu-specific options";;
-		x86)   target="i386";    config_target="GENERIC_386";;
-		*)     die "$(tc-arch) lists no defaults :/";;
+	local target=$(tc-arch) config_target
+	case ${target} in
+	amd64) target="x86_64";;
+	arm)   target="arm";     config_target="GENERIC_ARM";;
+	avr)   target="avr32";;
+	mips)  target="mips";    config_target="MIPS_ISA_1";;
+	ppc)   target="powerpc";;
+	sh)    target="sh";      config_target="SH4";;
+	x86)   target="i386";    config_target="486";;
 	esac
-	sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
-		extra/Configs/Config.${target}
+	if [[ -n ${config_target} ]] ; then
+		sed -i -e "s:default CONFIG_${config_target}:default CONFIG_${UCLIBC_CPU:-${config_target}}:" \
+			extra/Configs/Config.${target} || die
+	fi
 	sed -i -e "s:^HOSTCC.*=.*:HOSTCC=$(tc-getBUILD_CC):" Rules.mak
 
 	src_config