Disable --with-__thread when USE=glibc-compat20 #138028 by je_fro.

Package-Manager: portage-2.1.1_pre1-r5

4 files changed, 31 insertions, 17 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 281f92db7678..5836bca5f821 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.468 2006/06/27 15:59:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.469 2006/06/28 05:01:05 vapier Exp $
+
+  28 Jun 2006; Mike Frysinger <vapier@gentoo.org> glibc-2.3.6-r4.ebuild,
+  glibc-2.4-r3.ebuild:
+  Disable --with-__thread when USE=glibc-compat20 #138028 by je_fro.
 
   27 Jun 2006; Luca Barbato <lu_zero@gentoo.org> glibc-2.4-r3.ebuild:
   Marked stable on ppc
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index a4ac8975acec..9969ea2e00f4 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a
 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
@@ -517,18 +520,18 @@ EBUILD glibc-2.3.6-r3.ebuild 42710 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b6
 MD5 c2e89fc966f597b9a2fc19e0168e28f4 glibc-2.3.6-r3.ebuild 42710
 RMD160 5a6ba9bd1e2c6a47115fac3a1ec67da9db06b684 glibc-2.3.6-r3.ebuild 42710
 SHA256 8965552b0fe2b092bb26ea191c89c8704ca3943a5c523377befb69f9a4c9d2e5 glibc-2.3.6-r3.ebuild 42710
-EBUILD glibc-2.3.6-r4.ebuild 36651 RMD160 41a6bb36b4ff2dcba65bdebed62c3555180cf2c0 SHA1 94771d592f3c63dd600a1dccd3f9e853f46d25e1 SHA256 41c11ded4b9f7273213942adee303447e5456d6938256e45c36b072715ea99e2
-MD5 2fa61bf9d9c5eb443b258ab9fb700cff glibc-2.3.6-r4.ebuild 36651
-RMD160 41a6bb36b4ff2dcba65bdebed62c3555180cf2c0 glibc-2.3.6-r4.ebuild 36651
-SHA256 41c11ded4b9f7273213942adee303447e5456d6938256e45c36b072715ea99e2 glibc-2.3.6-r4.ebuild 36651
-EBUILD glibc-2.4-r3.ebuild 38171 RMD160 573479084c0fef8f3c9f1336c85b59d79dab3cd6 SHA1 5a922bf3b6f67afb400fbc5ff2681095699f70e6 SHA256 aed28509f61130148284eff2a56f9f045b6a2321b9f2470c8ef8a491f3c7f1ea
-MD5 72b2d5cc7bd483a5291bcc773c71f619 glibc-2.4-r3.ebuild 38171
-RMD160 573479084c0fef8f3c9f1336c85b59d79dab3cd6 glibc-2.4-r3.ebuild 38171
-SHA256 aed28509f61130148284eff2a56f9f045b6a2321b9f2470c8ef8a491f3c7f1ea glibc-2.4-r3.ebuild 38171
-MISC ChangeLog 94776 RMD160 ce52cf6462dec60b00a2b06e79bc2fec2ca34793 SHA1 b5256270ea7ab38da99e6684d8b447115f017bde SHA256 e0db352c8a43480b05e925e1f18fb43d7a61991f9238ebda9d037fd8fe334545
-MD5 443484847c3b8ca72851dddb69c6fbe0 ChangeLog 94776
-RMD160 ce52cf6462dec60b00a2b06e79bc2fec2ca34793 ChangeLog 94776
-SHA256 e0db352c8a43480b05e925e1f18fb43d7a61991f9238ebda9d037fd8fe334545 ChangeLog 94776
+EBUILD glibc-2.3.6-r4.ebuild 36675 RMD160 8f22c88db69d58356209feba38cdf0c0aab21c52 SHA1 b20e6464430370dfe70e6c3b6b76658ccbc56987 SHA256 e47a61454cde6754b31e1db549bfe88bbe7971b27279f4818c42b9ddc5f93809
+MD5 5ba0950d38d7848751b0634ee22385d5 glibc-2.3.6-r4.ebuild 36675
+RMD160 8f22c88db69d58356209feba38cdf0c0aab21c52 glibc-2.3.6-r4.ebuild 36675
+SHA256 e47a61454cde6754b31e1db549bfe88bbe7971b27279f4818c42b9ddc5f93809 glibc-2.3.6-r4.ebuild 36675
+EBUILD glibc-2.4-r3.ebuild 38194 RMD160 dbdfbda6ba24cddf5306d8cb2a1ae35da32009c5 SHA1 31cbb48c4e5c10681e7cb878b186cc6b9a5d70cf SHA256 36f3cffefeb7d7d7041ad911c8cdca520a4b8355708b92dc6ebfd02054ca4729
+MD5 65c39385562191980c83fc8682cbcae6 glibc-2.4-r3.ebuild 38194
+RMD160 dbdfbda6ba24cddf5306d8cb2a1ae35da32009c5 glibc-2.4-r3.ebuild 38194
+SHA256 36f3cffefeb7d7d7041ad911c8cdca520a4b8355708b92dc6ebfd02054ca4729 glibc-2.4-r3.ebuild 38194
+MISC ChangeLog 94941 RMD160 2c80e786367a2c2b580fa957a5f75ce60624fc06 SHA1 dbdf1fc48d13e0c11f922b645f531780c90fbdd1 SHA256 f043c92b54300ce5b19cd197e0c76f20c0803f4a8eb8ec476c3a4e4a853fb551
+MD5 a46119ebbcd589a685085852ad236aca ChangeLog 94941
+RMD160 2c80e786367a2c2b580fa957a5f75ce60624fc06 ChangeLog 94941
+SHA256 f043c92b54300ce5b19cd197e0c76f20c0803f4a8eb8ec476c3a4e4a853fb551 ChangeLog 94941
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -572,3 +575,10 @@ SHA256 8fdefc1e339f41e75899b11a02b1068d84afd742fbf992ac13bb433ef39cf974 files/di
 MD5 0839b75709d53cb72b9a3f6039d220a5 files/digest-glibc-2.4-r3 1575
 RMD160 c82aed2e0f3f556b051d7e3a1fc13c202f67bf2f files/digest-glibc-2.4-r3 1575
 SHA256 f22d43e9647ef7c83b51e5102caaca7e38b3d16783e6097b1a3cbe4b0957070e files/digest-glibc-2.4-r3 1575
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEog5oamhnQswr0vIRAufUAKC71XIM1ZiZMF9eTvU78NHVTfmXUACePecB
+rdjVaSqjN26ReBiVrTcIZbA=
+=rw+W
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.3.6-r4.ebuild b/sys-libs/glibc/glibc-2.3.6-r4.ebuild
index 61bd6d443f86..2f7575c70c77 100644
--- a/sys-libs/glibc/glibc-2.3.6-r4.ebuild
+++ b/sys-libs/glibc/glibc-2.3.6-r4.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.3.6-r4.ebuild,v 1.18 2006/06/27 00:06:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.19 2006/06/28 05:01:05 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -840,7 +840,7 @@ glibc_do_configure() {
 		if want_tls ; then
 			myconf="${myconf} --with-tls"
 
-			if want__thread ; then
+			if want__thread && ! use glibc-compat20 ; then
 				myconf="${myconf} --with-__thread"
 			else
 				myconf="${myconf} --without-__thread"
diff --git a/sys-libs/glibc/glibc-2.4-r3.ebuild b/sys-libs/glibc/glibc-2.4-r3.ebuild
index 9579b1522792..0d9d92380bae 100644
--- a/sys-libs/glibc/glibc-2.4-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r3.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-r3.ebuild,v 1.12 2006/06/27 15:59:12 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r3.ebuild,v 1.13 2006/06/28 05:01:05 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -875,7 +875,7 @@ glibc_do_configure() {
 		if want_tls ; then
 			myconf="${myconf} --with-tls"
 
-			if want__thread ; then
+			if want__thread && ! use glibc-compat20 ; then
 				myconf="${myconf} --with-__thread"
 			else
 				myconf="${myconf} --without-__thread"