diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-10-07 06:32:04 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-10-07 06:32:04 +0000 |
| commit | 995417524fb0541cf2a233a18587b9007c80336b (patch) | |
| tree | cd2a4f4ae06f9ec60ac9d981e7c090d2588e325d /sys-libs | |
| parent | Version bump, mostly fixing a few cjk issues in previous version (diff) | |
| download | historical-995417524fb0541cf2a233a18587b9007c80336b.tar.gz historical-995417524fb0541cf2a233a18587b9007c80336b.tar.bz2 historical-995417524fb0541cf2a233a18587b9007c80336b.zip | |
allow people to build linuxthreads again (ugh)
Package-Manager: portage-2.1.2_pre2-r5
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/Manifest | 14 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.5.ebuild | 17 |
2 files changed, 11 insertions, 20 deletions
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 09cfc7266994..b2b1bb244222 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -543,10 +543,10 @@ EBUILD glibc-2.4-r4.ebuild 38948 RMD160 1d268e7767afd0ea493e813699b6b82868c842c4 MD5 0dc3c3519d60f055aac9d3a4652cf71d glibc-2.4-r4.ebuild 38948 RMD160 1d268e7767afd0ea493e813699b6b82868c842c4 glibc-2.4-r4.ebuild 38948 SHA256 8d0fd8aa21580bb282034ccac1886059740ad49a1e40f12827e3c5b13c1b43cf glibc-2.4-r4.ebuild 38948 -EBUILD glibc-2.5.ebuild 37563 RMD160 da9d9a4016fe7e522bfea372c242115199c72b3a SHA1 1a70241c532ce381835bf7441159e49e23b97b57 SHA256 5afb4dc615f08c746dd652ec6649964fd2d86b6a75fc8cb6355f41a95afe30df -MD5 79baba6d076f31a213018e8eaefcd34f glibc-2.5.ebuild 37563 -RMD160 da9d9a4016fe7e522bfea372c242115199c72b3a glibc-2.5.ebuild 37563 -SHA256 5afb4dc615f08c746dd652ec6649964fd2d86b6a75fc8cb6355f41a95afe30df glibc-2.5.ebuild 37563 +EBUILD glibc-2.5.ebuild 37077 RMD160 d8fd7ad53c49e18a594c44b81717ce122e53437a SHA1 e956f73d5c9a830795b337aa4896c02199749d13 SHA256 4869e63f6270f84fc97845af0090c22aa4c9e41a4cb3c3a7c61c7948b42791a0 +MD5 3dbf29cdc677f7122b21c8d18cda1533 glibc-2.5.ebuild 37077 +RMD160 d8fd7ad53c49e18a594c44b81717ce122e53437a glibc-2.5.ebuild 37077 +SHA256 4869e63f6270f84fc97845af0090c22aa4c9e41a4cb3c3a7c61c7948b42791a0 glibc-2.5.ebuild 37077 MISC ChangeLog 96803 RMD160 7b0ca952ba58deb82ae2e913864afa11b988f38b SHA1 a8633e820738b29046bef0f4851ec187cfa7879b SHA256 6af3f08015e0b6dadf16ed43d85daf70bccf8bf542592030768a1faac2bed7cf MD5 daa398302c17bc66757a0389d4c3ae4c ChangeLog 96803 RMD160 7b0ca952ba58deb82ae2e913864afa11b988f38b ChangeLog 96803 @@ -606,7 +606,7 @@ SHA256 415dc49e4c0b254ed4731625acac2008699609a4da016560032f6326d4294320 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFJ0FaamhnQswr0vIRAveWAJ9BQOO+xGlhUFOonCSwGY85Os0JnACgq/Wq -+OnCBsb9Ax7V83tb3RiZMVM= -=lCYM +iD8DBQFFJ0n4amhnQswr0vIRAjehAJ9bduWJBdX6EVhA+4Rclf/nsmDxRgCeJHUH +EPM5xoUn63TbwnPc4jDrAmc= +=PXe5 -----END PGP SIGNATURE----- diff --git a/sys-libs/glibc/glibc-2.5.ebuild b/sys-libs/glibc/glibc-2.5.ebuild index b2b3e149e99b..9ae018d088db 100644 --- a/sys-libs/glibc/glibc-2.5.ebuild +++ b/sys-libs/glibc/glibc-2.5.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.5.ebuild,v 1.5 2006/10/07 05:55:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.6 2006/10/07 06:32:04 vapier Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -39,8 +39,6 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library" HOMEPAGE="http://www.gnu.org/software/libc/libc.html" LICENSE="LGPL-2" -# note that nptl/nptlonly/glibc-compat20 are for upgrade checks only. -# we dont generally support these things in this version. IUSE="nls build nptl nptlonly hardened multilib selinux glibc-omitfp profile glibc-compat20" export CBUILD=${CBUILD:-${CHOST}} @@ -1029,16 +1027,9 @@ pkg_setup() { fi fi - if use glibc-compat20 ; then - eerror "This version no longer provides compatibility with old broken" - eerror "applications. If you need this support, call your vendor" - eerror "and tell them to release an update that isn't broken." - die "non-TLS symbol errno@glibc_2.0 not supported" - fi - if want_linuxthreads ; then - ewarn "glibc-2.5 is nptl-only!" - [[ ${CTARGET} == i386-* ]] && eerror "NPTL requires a CHOST of i486 or better" - die "please add USE='nptl nptlonly' to make.conf" + if want_nptl && [[ ${CTARGET} == i386-* ]] ; then + eerror "NPTL requires a CHOST of i486 or better" + die "please fix your CHOST" fi if use nptlonly && ! use nptl ; then |