From 3be525a9601ada8a0ea4f88f1d298449c2e35497 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 28 Jun 2006 05:01:05 +0000 Subject: Disable --with-__thread when USE=glibc-compat20 #138028 by je_fro. (Portage version: 2.1.1_pre1-r5) --- sys-libs/glibc/ChangeLog | 6 +++++- sys-libs/glibc/glibc-2.3.6-r4.ebuild | 4 ++-- sys-libs/glibc/glibc-2.4-r3.ebuild | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'sys-libs') 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 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 glibc-2.4-r3.ebuild: Marked stable on ppc 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" -- cgit v1.2.3-65-gdbad