summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-03-16 06:12:26 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-03-16 06:12:26 +0000
commit2a454e1d2818cb74682dca0975eebca4b275e0ca (patch)
treedf06a204a96adcba1f631154de729de9d8c57a14 /sys-libs
parentUse proper toolchain commands. (diff)
downloadgentoo-2-2a454e1d2818cb74682dca0975eebca4b275e0ca.tar.gz
gentoo-2-2a454e1d2818cb74682dca0975eebca4b275e0ca.tar.bz2
gentoo-2-2a454e1d2818cb74682dca0975eebca4b275e0ca.zip
Fix assert in _dl_next_tls_modid-assert (sysdeps/generic/dl-tls.c), bug #52374. Fix building a crosscompiled glibc with nptl when no libc is present. Use --no-archive when creating locales as some apps don't like locale-archive, bug #82106.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/glibc/ChangeLog9
-rw-r--r--sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r12
-rw-r--r--sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild9
3 files changed, 12 insertions, 8 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 59a601e2ad6f..b3249bd1c60e 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-libs/glibc
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.326 2005/03/15 21:50:18 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.327 2005/03/16 06:12:26 eradicator Exp $
+
+ 15 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ glibc-2.3.4.20050125-r1.ebuild:
+ Fix assert in _dl_next_tls_modid-assert (sysdeps/generic/dl-tls.c), bug
+ #52374. Fix building a crosscompiled glibc with nptl when no libc is
+ present. Use --no-archive when creating locales as some apps don't like
+ locale-archive, bug #82106.
15 Mar 2005; Martin Schlemmer <azarah@gentoo.org>
+files/2.3.4/glibc-2.3.4-fix-_dl_next_tls_modid-assert.patch,
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1 b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
index 6d6993136341..112e879d5ee5 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20050125-r1
@@ -1,7 +1,7 @@
MD5 174ac5ed4f2851fcc866a3bac1e4a6a5 glibc-2.3.4.tar.bz2 13213560
MD5 7a199cd4965eb5622163756ae64358fe glibc-linuxthreads-2.3.4.tar.bz2 236183
MD5 1f586b91280665cb8df70bdd7c4583ba glibc-libidn-2.3.4.tar.bz2 100711
-MD5 f6198adee3d4275b4f161a8c4fb86cc6 glibc-2.3.4-patches-1.6.tar.bz2 34018
+MD5 59e183db85229349e83585c35fd3c4c0 glibc-2.3.4-patches-1.7.tar.bz2 37421
MD5 071ec6e3562813a382b75610980bab98 glibc-manpages-2.3.4-r1.tar.bz2 22276
MD5 04166455bebb5563bb9a8feca2e3c26c glibc-infopages-2.3.4-r1.tar.bz2 1294898
MD5 2c183c16b572f533d07525472d64cdc7 glibc-fedora-20041219T2331.tar.bz2 761998
diff --git a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
index 2ddc5f168088..eaaf125959db 100644
--- a/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20050125-r1.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-r1.ebuild,v 1.24 2005/03/15 23:01:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20050125-r1.ebuild,v 1.25 2005/03/16 06:12:26 eradicator Exp $
# Here's how the cross-compile logic breaks down ...
# CTARGET - machine that will target the binaries
@@ -27,21 +27,18 @@ GLIBC_MANPAGE_VERSION="2.3.4-r1"
GLIBC_INFOPAGE_VERSION="2.3.4-r1"
# Gentoo patchset
-PATCH_VER="1.6"
+PATCH_VER="1.7"
# C Stubbs addon (contained in fedora, so ignoring)
#CSTUBS_VER="2.1.2"
#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
#CSTUBS_URI="http://dev.gentoo.org/~eradicator/glibc/${CSTUBS_TARBALL}"
-# Fedora addons
+# Fedora addons (from RHEL's glibc-2.3.4-2.src.rpm)
FEDORA_VER="20041219T2331"
FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
FEDORA_URI="http://dev.gentoo.org/~eradicator/glibc/${FEDORA_TARBALL}"
-# (Recent snapshots fails with 2.6.5 and earlier)
-NPTL_KERNEL_VERSION="2.6.6"
-
GENTOO_TOOLCHAIN_BASE_URI="http://dev.gentoo.org/~eradicator/glibc"
### PUNT OUT TO ECLASS?? ###