diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-13 14:31:45 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-02-13 14:31:45 +0000 |
| commit | 368e6cd3ddcd3ec3b82fc36d10c90d584d9181b7 (patch) | |
| tree | 199c1f22f83b303b5ecea5870282ab3728164db9 /sys-libs | |
| parent | - p.masked media-libs/libextractor bug #79704 (diff) | |
| download | gentoo-2-368e6cd3ddcd3ec3b82fc36d10c90d584d9181b7.tar.gz gentoo-2-368e6cd3ddcd3ec3b82fc36d10c90d584d9181b7.tar.bz2 gentoo-2-368e6cd3ddcd3ec3b82fc36d10c90d584d9181b7.zip | |
Updated preinst deletion of /lib/tls to also occur if we are -nptl.
(Portage version: 2.0.51-r15)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20050125.ebuild | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild index 54ed39d866db..b43f25ea0091 100644 --- a/sys-libs/glibc/glibc-2.3.4.20050125.ebuild +++ b/sys-libs/glibc/glibc-2.3.4.20050125.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.17 2005/02/13 10:51:04 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125.ebuild,v 1.18 2005/02/13 14:31:45 eradicator Exp $ KEYWORDS="~amd64 ~mips ~sparc ~x86" @@ -228,9 +228,9 @@ toolchain-glibc_pkg_preinst() { # it appears that /lib/tls is sometimes not removed. See bug # 69258 for more info. - if [ -d /${ROOT}$(alt_libdir)/tls ] && use nptlonly ; then + if [ -d /${ROOT}$(alt_libdir)/tls ] && { use nptlonly || use !nptl; }; then addwrite /${ROOT}$(alt_libdir)/ - ewarn "nptlonly in USE, removing /${ROOT}$(alt_libdir)/tls..." + ewarn "nptlonly or -nptl in USE, removing /${ROOT}$(alt_libdir)/tls..." rm -rf /${ROOT}$(alt_libdir)/tls || die fi } |