Force gcc-4 for ppc targets #125797 and allow nptl for most targets #127358.

Package-Manager: portage-2.1_pre7-r2

3 files changed, 18 insertions, 23 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 046341543afc..706cccc33b3c 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.436 2006/03/17 04:34:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.437 2006/03/29 04:41:23 vapier Exp $
+
+  29 Mar 2006; Mike Frysinger <vapier@gentoo.org> glibc-2.4-r1.ebuild:
+  Force gcc-4 for ppc targets #125797 and allow nptl for most targets #127358.
 
 *glibc-2.4-r1 (17 Mar 2006)
 
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index ec759241e777..dfaff8229d1a 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f015a9569db33a2a004d9bf4b4bb68cc ChangeLog 90849
-RMD160 717a6a0a5c8677eb8894201a513aa7ff2eba3bc8 ChangeLog 90849
-SHA256 c2d58d244c49ae5fd1caf24d067198faa00c4ad9a42e908d99862613e1f2dd87 ChangeLog 90849
+MD5 1f5292adf8adb4a1e586429792949ddb ChangeLog 91000
+RMD160 f5343a4088c3d0aad4c11354db67418a48cbfe07 ChangeLog 91000
+SHA256 35fd4ea45b95c085e7111feff06c49096865ba9bad4038a59c770ec361d3300d ChangeLog 91000
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -343,9 +343,6 @@ SHA256 73a3aef3f10593394a3dc1c9ceafdf7854de9a8a565a7ffea6fb37deea903c92 files/di
 MD5 a9b2d44d0396a4996c59e30664cd3643 files/digest-glibc-2.3.6-r3 1876
 RMD160 cc9d6cfcd8541c7dc518560eb50dfd8c61f98ab8 files/digest-glibc-2.3.6-r3 1876
 SHA256 8ec9b852e961654f255e4ae73c2fcc51482fb1b0519834688dba4614f8353216 files/digest-glibc-2.3.6-r3 1876
-MD5 ae74cbe103b045037059f3a403f87c51 files/digest-glibc-2.4 1006
-RMD160 dd7230a51196b5c5ae244a905725804e888e6ee5 files/digest-glibc-2.4 1006
-SHA256 204561c6b585828c91e761ee2cab644e4f21b89faa622eeea32b15f0caadc88d files/digest-glibc-2.4 1006
 MD5 7f238701dc80be184d3b46a3babaee2b files/digest-glibc-2.4-r1 1292
 RMD160 2973b76f09f44d280289e9dec583f88ee4c636b2 files/digest-glibc-2.4-r1 1292
 SHA256 2cee383fdb2b7f9d72d4a87fcc9ae92e952f2c5bdf5cf940054bc52cf27df25e files/digest-glibc-2.4-r1 1292
@@ -427,19 +424,16 @@ SHA256 cbc0e956d7825fb11fcd5c7e58abc4273364bebb75b58b94f58e6bf0cb7463b9 glibc-2.
 MD5 287fce00bb2f09dcdb2ddd6eab037278 glibc-2.3.6.ebuild 40748
 RMD160 f41d2f46e5df9f90f27c00b39c73e5d0f651ac6d glibc-2.3.6.ebuild 40748
 SHA256 eed60a53a42b9c70b05068e15e7c58e3f1e3fc23b21f41c569fd112665f91775 glibc-2.3.6.ebuild 40748
-MD5 616b9ac858683784575860873eee7eec glibc-2.4-r1.ebuild 42926
-RMD160 f7fa950aa750dacd9ffe8d726b6c02eb54aa6f72 glibc-2.4-r1.ebuild 42926
-SHA256 e3661d1c653dfc953a471a5d5c41fc00d84516d744962030b43f9da6ca9efd32 glibc-2.4-r1.ebuild 42926
-MD5 7f1069e3cd454441cc5d0b3be9a02355 glibc-2.4.ebuild 42872
-RMD160 9e88f714e0180127c9dd840b75200ab95a44750c glibc-2.4.ebuild 42872
-SHA256 1e09c37c379e50ebda6ce85ffb8c1e7e2be0a03e3660dd8b675a4a8844fc0748 glibc-2.4.ebuild 42872
+MD5 fa0216b2964ec91a8986908aee8b1eef glibc-2.4-r1.ebuild 42921
+RMD160 dae3994a7aa7482591c18f28188b76fe2b0ba0ce glibc-2.4-r1.ebuild 42921
+SHA256 22384fd3875774bb0cfd4ba824bd3849dcb775b5699d2c685ea5e0a634c98dd5 glibc-2.4-r1.ebuild 42921
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
 SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a metadata.xml 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEG1oc2+ySkm8kpY0RAghvAKCz6yd370+Jug5Be1IEsum5c/yu9ACfVdmV
-3u6Jv1HuJXErxiT2a5Lon1Q=
-=iI+z
+iD8DBQFEKhBW2+ySkm8kpY0RAhrPAKCAC0+AXaR8LJLSUj5SNP4B5JYcsACgl3o0
+/1cC74DtbzyQG8Y959TM98U=
+=r5sT
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.4-r1.ebuild b/sys-libs/glibc/glibc-2.4-r1.ebuild
index 123feb55e507..7fefe8e9c76a 100644
--- a/sys-libs/glibc/glibc-2.4-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r1.ebuild,v 1.2 2006/03/18 00:53:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r1.ebuild,v 1.3 2006/03/29 04:41:23 vapier Exp $
 
 # TODO:
 #  - fix warning from glibc build system:
@@ -818,19 +818,16 @@ want_nptl() {
 	want_tls || return 1
 	use nptl || return 1
 
-	# Archs that can use NPTL
+	# Only list the arches that cannot do NPTL
 	case $(tc-arch) in
-		alpha|amd64|ia64|mips|ppc|ppc64|s390|sh|x86)
-			return 0;
-		;;
+		hppa|m68k) return 1;;
 		sparc)
 			# >= v9 is needed for nptl.
 			[[ "${PROFILE_ARCH}" == "sparc" ]] && return 1
-			return 0;
 		;;
 	esac
 
-	return 1
+	return 0
 }
 
 want_linuxthreads() {
@@ -1092,6 +1089,7 @@ RESTRICT="nostrip multilib-pkg-force"
 # arch: we need to make sure our binutils/gcc supports TLS
 DEPEND=">=sys-devel/gcc-3.4.4
 	arm? ( >=sys-devel/binutils-2.16.90 >=sys-devel/gcc-4.1.0 )
+	ppc? ( >=sys-devel/gcc-4.0.0 )
 	nptl? ( >=sys-kernel/linux-headers-2.6.5 )
 	>=sys-devel/binutils-2.15.94
 	>=sys-devel/gcc-config-1.3.12