removed 0918 snapshot, it will occasionally cause processes to not return. fixes bug 64787. backported the necessary nptl pthread header fix from it to 0808.

7 files changed, 113 insertions, 795 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 50314ad7b59a..c2a1462bd6e5 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.256 2004/09/21 19:19:11 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.257 2004/09/22 00:46:37 lv Exp $
+
+  21 Sep 2004; Travis Tilley <lv@gentoo.org>
+  -files/2.3.4/glibc-2.3.4-fix-broken-ldd.patch,
+  +files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch,
+  glibc-2.3.4.20040808.ebuild, -glibc-2.3.4.20040918.ebuild:
+  removed 0918 snapshot, it will occasionally cause processes to not return.
+  fixes bug 64787. backported the necessary nptl pthread header fix from it to
+  0808.
 
   21 Sep 2004; Travis Tilley <lv@gentoo.org>
   +files/2.3.4/glibc-2.3.4-fix-broken-ldd.patch, glibc-2.3.4.20040918.ebuild:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 02b22dc39b45..2ff0d6ff601e 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,11 +1,10 @@
-MD5 5144e9dd5e0bb2bf88a7a9522de0a09e glibc-2.3.4.20040808.ebuild 21202
 MD5 4b47e58e600eebddddb96287bdcc42da glibc-2.3.2-r11.ebuild 20306
 MD5 c3e722bbae2f66c4ce6ad6a7ca8689b3 glibc-2.3.3.20040420-r1.ebuild 21628
 MD5 bab5970ce8decc290de6ba2079d202cf glibc-2.3.4.20040619-r1.ebuild 20861
-MD5 d1b5c35b91732f8168ed6a9351715163 ChangeLog 52360
+MD5 b8ee68d8836f5e7e65e316380ee04846 ChangeLog 52737
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 f3cfb768f888ac432bddfa481c2febce glibc-2.2.5-r9.ebuild 10877
-MD5 a41ed0ef6b73e9074deb4966864b763d glibc-2.3.4.20040918.ebuild 21236
+MD5 cb982334c82edec5bd2326629bd7b73c glibc-2.3.4.20040808.ebuild 21310
 MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844
 MD5 135f8145885a2f4f9876fe973f33ddf6 files/glibc-2.2.4-string2.h.diff 5221
 MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612
@@ -13,7 +12,6 @@ MD5 bbe355d94c5a36e11f543d12b70b5702 files/glibc-sec-hotfix-20040916.patch 3080
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 2f05d3181e9a9ded61e074147af47e8e files/digest-glibc-2.3.4.20040808 382
-MD5 2a0608d2d5f796746da817e66d3767c3 files/digest-glibc-2.3.4.20040918 382
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
 MD5 13701e6cc0de584680502c0cd958f2cf files/glibc-sec-hotfix-20040804.patch 4319
@@ -114,4 +112,4 @@ MD5 89a6d0d924c8b05c4e06bdffb7c69b41 files/2.3.4/glibc-2.3.4-arm-ioperm.patch 40
 MD5 03e0e9a2235886c0abbe98bdafd0d5ce files/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch 382
 MD5 e109c03013bd08a2b96e2c2ca9017a4b files/2.3.4/glibc-gentoo-libdir.patch 1347
 MD5 16f18501efd56811e724231470dc5d00 files/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch 2562
-MD5 616aef82ac200ff02d23f6fd66e2dee7 files/2.3.4/glibc-2.3.4-fix-broken-ldd.patch 789
+MD5 7960564130a698073bdd3597a781e39b files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch 3304
diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fix-broken-ldd.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fix-broken-ldd.patch
deleted file mode 100644
index 934876a519de..000000000000
--- a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-fix-broken-ldd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-===================================================================
-RCS file: /cvs/glibc/libc/elf/ldd.bash.in,v
-retrieving revision 1.31
-retrieving revision 1.32
-diff -u -r1.31 -r1.32
---- libc/elf/ldd.bash.in	2004/09/18 06:46:38	1.31
-+++ libc/elf/ldd.bash.in	2004/09/21 15:38:48	1.32
-@@ -75,6 +75,7 @@
-   -u | --u | --un | --unu | --unus | --unuse | --unused)
-     unused=yes
-     shift
-+    ;;
-   --v | --ve | --ver)
-     echo >&2 $"ldd: option \`$1' is ambiguous"
-     exit 1
-@@ -102,7 +103,7 @@
- add_env="LD_TRACE_LOADED_OBJECTS=1 LD_WARN=$warn LD_BIND_NOW=$bind_now"
- add_env="$add_env LD_VERBOSE=$verbose"
- if test "$unused" = yes; then
--  add_env="$add_env LD_DEBUG="$LD_DEBUG${LD_DEBUG:+,}unused"
-+  add_env="$add_env LD_DEBUG=\"$LD_DEBUG${LD_DEBUG:+,}unused\""
- fi
- case $# in
- 0)
diff --git a/sys-libs/glibc/files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch
new file mode 100644
index 000000000000..755169014248
--- /dev/null
+++ b/sys-libs/glibc/files/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch
@@ -0,0 +1,96 @@
+--- glibc-2.3.3.old/nptl/sysdeps/pthread/pthread.h	2004-09-21 19:52:49.003553536 +0000
++++ glibc-2.3.3/nptl/sysdeps/pthread/pthread.h	2004-09-21 19:55:01.582398488 +0000
+@@ -27,6 +27,7 @@
+ #include <signal.h>
+ #include <bits/pthreadtypes.h>
+ #include <bits/setjmp.h>
++#include <bits/wordsize.h>
+ 
+ 
+ /* Detach state.  */
+@@ -63,17 +64,26 @@
+ #define PTHREAD_MUTEX_INITIALIZER \
+   { }
+ #ifdef __USE_GNU
+-# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
+-  { .__data = { .__kind = PTHREAD_MUTEX_RECURSIVE_NP } }
+-# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
+-  { .__data = { .__kind = PTHREAD_MUTEX_ERRORCHECK_NP } }
+-# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
+-  { .__data = { .__kind = PTHREAD_MUTEX_ADAPTIVE_NP } }
++# if __WORDSIZE == 64
++#  define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
++  { { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP } }
++#  define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
++  { { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP } }
++#  define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
++  { { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP } }
++# else
++#  define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
++  { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP } }
++#  define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
++  { { 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP } }
++#  define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
++  { { 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP } }
++# endif
+ #endif
+ 
+ 
+ /* Read-write lock types.  */
+-#ifdef __USE_UNIX98
++#if defined __USE_UNIX98 || defined __USE_XOPEN2K
+ enum
+ {
+   PTHREAD_RWLOCK_PREFER_READER_NP,
+@@ -81,15 +91,21 @@
+   PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP,
+   PTHREAD_RWLOCK_DEFAULT_NP = PTHREAD_RWLOCK_PREFER_READER_NP
+ };
+-#endif  /* Unix98 */
+ 
+ /* Read-write lock initializers.  */
+-#define PTHREAD_RWLOCK_INITIALIZER \
++# define PTHREAD_RWLOCK_INITIALIZER \
+   { }
+-#ifdef __USE_GNU
+-# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
+-  { .__data = { .__flags = PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
+-#endif
++# ifdef __USE_GNU
++#  if __WORDSIZE == 64
++#   define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
++  { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,					      \
++      PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
++#  else
++#   define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
++  { { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
++#  endif
++# endif
++#endif  /* Unix98 or XOpen2K */
+ 
+ 
+ /* Scheduler inheritance.  */
+@@ -390,9 +406,12 @@
+ /* Guarantee that the initialization function INIT_ROUTINE will be called
+    only once, even if pthread_once is executed several times with the
+    same ONCE_CONTROL argument. ONCE_CONTROL must point to a static or
+-   extern variable initialized to PTHREAD_ONCE_INIT.  */
++   extern variable initialized to PTHREAD_ONCE_INIT.
++
++   The initialization functions might throw exception which is why
++   this function is not marked with __THROW.  */
+ extern int pthread_once (pthread_once_t *__once_control,
+-			 void (*__init_routine) (void)) __THROW;
++			 void (*__init_routine) (void));
+ 
+ 
+ /* Functions for handling cancellation.
+@@ -699,7 +718,7 @@
+ #endif
+ 
+ 
+-#ifdef __USE_UNIX98
++#if defined __USE_UNIX98 || defined __USE_XOPEN2K
+ /* Functions for handling read-write locks.  */
+ 
+ /* Initialize read-write lock RWLOCK using attributes ATTR, or use
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040918 b/sys-libs/glibc/files/digest-glibc-2.3.4.20040918
deleted file mode 100644
index fd4803ec4010..000000000000
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20040918
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 84dabbf0b9b5370793a416687d7b5252 glibc-2.3.3.tar.bz2 13298567
-MD5 2a138a32ffdb52fc1be54088d5d49420 glibc-manpages-2.3.4.tar.bz2 14759
-MD5 eabe1f4779fc27cde985b0713f930827 glibc-infopages-2.3.4.tar.bz2 1175502
-MD5 dc09b4c1a29f69232441f7f5abbcc7b9 glibc-hppa-patches-2004-08-24.tar.gz 9739
-MD5 d8c1407ca7bc30e05fe2e51facc94f9e glibc-2.3.4-branch-update-20040918.patch.bz2 1479179
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
index dcd65d7bff79..d8c49f34e727 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.20040808.ebuild,v 1.18 2004/09/13 04:05:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808.ebuild,v 1.19 2004/09/22 00:46:37 lv Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -501,9 +501,13 @@ src_unpack() {
 
 	# Remaining patches
 	cd ${S}
+
 	# fix for http://sources.redhat.com/bugzilla/show_bug.cgi?id=227
 	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch
 
+	# fix for using nptl's pthread.h with g++
+	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-nptl-pthread.h-g++-fix.patch
+
 	# Fix permissions on some of the scripts
 	chmod u+x ${S}/scripts/*.sh
 }
diff --git a/sys-libs/glibc/glibc-2.3.4.20040918.ebuild b/sys-libs/glibc/glibc-2.3.4.20040918.ebuild
deleted file mode 100644
index b95c7e70e7d8..000000000000
--- a/sys-libs/glibc/glibc-2.3.4.20040918.ebuild
+++ /dev/null
@@ -1,759 +0,0 @@
-# Copyright 1999-2004 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.20040918.ebuild,v 1.4 2004/09/21 23:51:51 lv Exp $
-
-inherit eutils flag-o-matic gcc
-
-# Branch update support.  Following will disable:
-#  BRANCH_UPDATE=
-BRANCH_UPDATE="20040918"
-
-
-# Minimum kernel version we support
-# (Recent snapshots fails with 2.6.5 and earlier)
-MIN_KERNEL_VERSION="2.6.5"
-
-
-if [ -z "${BRANCH_UPDATE}" ]; then
-	BASE_PV="${NEW_PV}"
-	NEW_PV="${NEW_PV}"
-else
-	BASE_PV="2.3.3"
-	NEW_PV="${PV%.*}"
-fi
-
-
-S="${WORKDIR}/${PN}-${BASE_PV}"
-DESCRIPTION="GNU libc6 (also called glibc2) C library"
-HOMEPAGE="http://sources.redhat.com/glibc/"
-
-HPPA_PATCHES=2004-08-24
-
-SRC_URI="http://dev.gentoo.org/~lv/${PN}-${BASE_PV}.tar.bz2
-	http://dev.gentoo.org/~lv/${PN}-manpages-${NEW_PV}.tar.bz2
-	http://dev.gentoo.org/~lv/glibc-infopages-${NEW_PV}.tar.bz2
-	hppa? ( http://parisc-linux.org/~carlos/glibc-work/glibc-hppa-patches-${HPPA_PATCHES}.tar.gz )"
-
-[ ! -z "${BRANCH_UPDATE}" ] && SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~lv/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2.2"
-KEYWORDS="-* -amd64"
-IUSE="nls pic build nptl erandom hardened makecheck multilib debug userlocales"
-RESTRICT="nostrip" # we'll handle stripping ourself #46186
-
-# We need new cleanup attribute support from gcc for NPTL among things ...
-# We also need linux26-headers if using NPTL. Including kernel headers is
-# incredibly unreliable, and this new linux-headers release from plasmaroo
-# should work with userspace apps, at least on amd64 and ppc64.
-DEPEND=">=sys-devel/gcc-3.2.3-r1
-	nptl? ( >=sys-devel/gcc-3.3.1-r1 )
-	>=sys-devel/binutils-2.14.90.0.6-r1
-	virtual/os-headers
-	nptl? ( >=sys-kernel/linux26-headers-2.6.5 )
-	nls? ( sys-devel/gettext )"
-RDEPEND="virtual/os-headers
-	sys-apps/baselayout
-	nls? ( sys-devel/gettext )"
-
-PROVIDE="virtual/glibc virtual/libc"
-
-
-# (very) Theoretical cross-compiler support
-[ -z "${CCHOST}" ] && CCHOST="${CHOST}"
-
-# We need to be able to set alternative headers for
-# compiling for non-native platform
-# Will also become useful for testing kernel-headers without screwing up
-# whole system
-[ -z "${ALT_HEADERS}" ] && ALT_HEADERS="${ROOT}/usr/include"
-
-
-setup_flags() {
-	# Over-zealous CFLAGS can often cause problems.  What may work for one person may not
-	# work for another.  To avoid a large influx of bugs relating to failed builds, we
-	# strip most CFLAGS out to ensure as few problems as possible.
-	strip-flags
-	strip-unsupported-flags
-
-	# -freorder-blocks for all but ppc
-	use ppc || append-flags "-freorder-blocks"
-
-	# Sparc/Sparc64 support
-	if use sparc; then
-		# Both sparc and sparc64 can use -fcall-used-g6.  -g7 is bad, though.
-		filter-flags "-fcall-used-g7"
-		append-flags "-fcall-used-g6"
-
-		# Sparc64 Only support...
-		if [ "${PROFILE_ARCH}" = "sparc64" ]; then
-			# Get rid of -mcpu options (the CHOST will fix this up) and flags known to fail
-			filter-flags "-mcpu=ultrasparc -mcpu=v9 -mvis"
-
-			# Setup the CHOST properly to insure "sparcv9"
-			# This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler
-			if [ "${CHOST}" = "sparc-unknown-linux-gnu" ]; then
-				export CHOST="sparcv9-unknown-linux-gnu"
-				export CCHOST="sparcv9-unknown-linux-gnu"
-			fi
-		fi
-	fi
-
-	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
-		# broken in 3.4.x
-		replace-flags -march=pentium-m -mtune=pentium3
-		ewarn "-march=pentium-m seems to be broken in gcc 3.4, changing to -mtune=pentium3"
-	fi
-
-	# We don't want these flags for glibc
-	filter-flags -fomit-frame-pointer -malign-double
-	filter-ldflags -pie
-
-	# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here
-	append-flags -O2
-	export LDFLAGS="${LDFLAGS//-Wl,--relax}"
-}
-
-
-check_kheader_version() {
-	local header="${ALT_HEADERS}/linux/version.h"
-
-	[ -z "$1" ] && return 1
-
-	if [ -f "${header}" ]; then
-		local version="`grep 'LINUX_VERSION_CODE' ${header} | \
-			sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`"
-
-		if [ "${version}" -ge "$1" ]; then
-			return 0
-		fi
-	fi
-
-	return 1
-}
-
-
-check_nptl_support() {
-	local min_kernel_version="$(KV_to_int "${MIN_KERNEL_VERSION}")"
-
-	echo
-
-	einfon "Checking gcc for __thread support ... "
-	if ! gcc -c ${FILESDIR}/test-__thread.c -o ${T}/test2.o &> /dev/null; then
-		echo "no"
-		echo
-		eerror "Could not find a gcc that supports the __thread directive!"
-		eerror "please update to gcc-3.2.2-r1 or later, and try again."
-		die "No __thread support in gcc!"
-	else
-		echo "yes"
-	fi
-
-	# Building fails on an non-supporting kernel
-	einfon "Checking kernel version (>=${MIN_KERNEL_VERSION}) ... "
-	if [ "`get_KV`" -lt "${min_kernel_version}" ]; then
-		echo "no"
-		echo
-		eerror "You need a kernel of at least version ${MIN_KERNEL_VERSION}"
-		eerror "for NPTL support!"
-		die "Kernel version too low!"
-	else
-		echo "yes"
-	fi
-
-	# Building fails with too low linux-headers
-	einfon "Checking linux-headers version (>=${MIN_KERNEL_VERSION}) ... "
-	if ! check_kheader_version "${min_kernel_version}"; then
-		echo "no"
-		echo
-		eerror "You need linux-headers of at least version ${MIN_KERNEL_VERSION}"
-		eerror "for NPTL support!"
-		die "linux-headers version too low!"
-	else
-		echo "yes"
-	fi
-
-	echo
-}
-
-
-want_nptl() {
-	if use nptl; then
-		# Archs that can use NPTL
-		if use amd64 || use alpha || use ia64 || use ppc || \
-		   use ppc64 || use s390 || use sparc; then
-			return 0
-		fi
-
-		# Specific x86 CHOSTS that can use NPTL
-		if use x86; then
-			case "${CHOST/-*}" in
-				i486|i586|i686)	return 0 ;;
-			esac
-		fi
-	fi
-
-	return 1
-}
-
-
-want_tls() {
-	# Archs that can use TLS (Thread Local Storage)
-	if use amd64 || use alpha || use ia64 || use ppc || \
-	   use ppc64 || use s390 || use sparc; then
-		return 0
-	fi
-
-	# Specific x86 CHOSTS that can use TLS
-	if use x86; then
-		case "${CHOST/-*}" in
-			i486|i586|i686)	return 0 ;;
-		esac
-
-	fi
-
-	return 1
-}
-
-
-do_makecheck() {
-	ATIME=`mount | awk '{ print $3,$6 }' | grep ^\/\  | grep noatime`
-	if [ "$ATIME" = "" ]; then
-		cd ${WORKDIR}/build
-		make check || die
-	else
-		ewarn "remounting / without noatime option so that make check"
-		ewarn "does not fail!"
-		epause 2
-		mount / -o remount,atime
-		cd ${WORKDIR}/build
-		make check || die
-		einfo "remounting / with noatime"
-		mount / -o remount,noatime
-	fi
-}
-
-
-install_locales() {
-	unset LANGUAGE LANG LC_ALL
-	cd ${WORKDIR}/build
-	make PARALLELMFLAGS="${MAKEOPTS}" \
-		install_root=${D} localedata/install-locales || die
-	keepdir /usr/lib/locale/ru_RU/LC_MESSAGES
-}
-
-
-setup_locales() {
-	if use !userlocales || use makecheck; then
-		einfo "makecheck in USE or userlocales not enabled, installing -ALL- locales..."
-		install_locales || die
-	elif [ -e /etc/locales.build ]; then
-		einfo "Installing locales in /etc/locales.build..."
-		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
-		cat /etc/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
-			>> SUPPORTED.locales
-		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
-		install_locales || die
-	elif [ -e ${FILESDIR}/locales.build ]; then
-		einfo "Installing locales in ${FILESDIR}/locales.build..."
-		echo 'SUPPORTED-LOCALES=\' > SUPPORTED.locales
-		cat ${FILESDIR}/locales.build | grep -v -e ^$ -e ^\# | sed 's/$/\ \\/g' \
-			>> SUPPORTED.locales
-		cat SUPPORTED.locales > ${S}/localedata/SUPPORTED || die
-		install_locales || die
-	else
-		einfo "Installing -ALL- locales..."
-		install_locales || die
-	fi
-}
-
-
-pkg_setup() {
-	# We need gcc 3.2 or later ...
-	if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ]; then
-		echo
-		eerror "As of glibc-2.3, gcc-3.2 or later is needed"
-		eerror "for the build to succeed."
-		die "GCC too old"
-	fi
-	echo
-
-	hasq sandbox $FEATURES && use makecheck && die "sandbox breaks make check. either take makecheck out of USE or set FEATURES=-sandbox"
-}
-
-
-do_arch_amd64_patches() {
-	cd ${S};
-	# CONF_LIBDIR support
-	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
-	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
-}
-
-
-do_arch_alpha_patches() {
-	cd ${S}
-
-	# Fix compatability with compaq compilers by ifdef'ing out some
-	# 2.3.2 additions.
-	# <taviso@gentoo.org> (14 Jun 2003).
-	epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-decc-compaq.patch
-
-	# Fix compilation with >=gcc-3.2.3 (01 Nov 2003 agriffis)
-#	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-alpha-pwrite.patch
-}
-
-
-do_arch_arm_patches() {
-	cd ${S};
-
-	# Any needed patches for arm go here
-	epatch ${FILESDIR}/2.3.4/${PN}-2.3.4-arm-ioperm.patch
-}
-
-
-do_arch_hppa_patches() {
-	einfo "Applying hppa specific path of ${HPPA_PATCHES} ..."
-	cd ${T}
-	unpack glibc-hppa-patches-${HPPA_PATCHES}.tar.gz
-	cd ${S}
-	export EPATCH_OPTS=-p1
-	for i in ${T}/glibc-hppa-patches-${HPPA_PATCHES}/*.diff
-	do
-		epatch ${i}
-	done
-
-	use hardened && epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch
-
-}
-
-
-do_arch_ia64_patches() {
-	cd ${S};
-
-	# The basically problem is glibc doesn't store information about
-	# what the kernel interface is so that it can't efficiently set up
-	# parameters for system calls.  This patch from H.J. Lu fixes it:
-	#
-	#   http://sources.redhat.com/ml/libc-alpha/2003-09/msg00165.html
-
-#	epatch ${FILESDIR}/2.3.2/${LOCAL_P}-ia64-LOAD_ARGS-fixup.patch
-}
-
-
-do_arch_mips_patches() {
-	cd ${S}
-
-	# A few patches only for the MIPS platform.  Descriptions of what they
-	# do can be found in the patch headers.
-	# <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003)
-	# <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches
-	# <iluxa@gentoo.org> add n32/n64 patches, remove pread patch
-	epatch ${FILESDIR}/2.3.3/mips-addabi.diff
-	epatch ${FILESDIR}/2.3.3/mips-syscall.h.diff
-	epatch ${FILESDIR}/2.3.3/mips-sysify.diff
-
-	# Need to install into /lib for n32-only userland for now.
-	# Propper solution is to make all userland /lib{32|64}-aware.
-	use multilib || epatch ${FILESDIR}/2.3.3/mips-nolib3264.diff
-}
-
-
-do_arch_ppc_patches() {
-	cd ${S};
-	# Any needed patches for ppc go here
-}
-
-
-do_arch_ppc64_patches() {
-	cd ${S};
-	# Any needed patches for ppc64 go here
-}
-
-
-do_arch_s390_patches() {
-	cd ${S};
-
-	# Any needed patches for s390 go here
-}
-
-
-do_arch_sparc_patches() {
-	cd ${S};
-
-	# Any needed patches for sparc go here
-}
-
-
-do_arch_x86_patches() {
-	cd ${S};
-	# CONF_LIBDIR support
-	epatch ${FILESDIR}/2.3.4/glibc-gentoo-libdir.patch
-	sed -i -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" ${S}/sysdeps/unix/sysv/linux/configure
-}
-
-
-do_pax_patches() {
-	cd ${S}
-
-	# localedef contains nested function trampolines, which trigger
-	# segfaults under PaX -solar
-	# Debian Bug (#231438, #198099)
-	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-localedef-fix-trampoline.patch
-
-	# With latest versions of glibc, a lot of apps failed on a PaX enabled
-	# system with:
-	#
-	#  cannot enable executable stack as shared object requires: Permission denied
-	#
-	# This is due to PaX 'exec-protecting' the stack, and ld.so then trying
-	# to make the stack executable due to some libraries not containing the
-	# PT_GNU_STACK section.  Bug #32960.  <azarah@gentoo.org> (12 Nov 2003).
-	use mips || epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-dl_execstack-PaX-support.patch
-
-	# Program header support for PaX.
-	epatch ${FILESDIR}/2.3.3/${PN}-2.3.3_pre20040117-pt_pax.diff
-
-	# Suppress unresolvable relocation against symbol `main' in Scrt1.o
-	# can be reproduced with compiling net-dns/bind-9.2.2-r3 using -pie
-	epatch ${FILESDIR}/2.3.4/glibc-2.3.4.20040808-i386-got-fix.diff
-}
-
-
-do_hardened_fixes() {
-	# this patch is needed to compile nptl with a hardened gcc
-	has_hardened && want_nptl && \
-		epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hardened-sysdep-shared.patch
-}
-
-
-do_ssp_patches() {
-	# To circumvent problems with propolice __guard and
-	# __guard_setup__stack_smash_handler
-	#
-	#  http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml
-	if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ]; then
-		epatch ${FILESDIR}/2.3.3/glibc-2.3.2-propolice-guard-functions-v3.patch
-		cp ${FILESDIR}/2.3.3/ssp.c ${S}/sysdeps/unix/sysv/linux || \
-			die "failed to copy ssp.c to ${S}/sysdeps/unix/sysv/linux/"
-	fi
-
-	# patch this regardless of architecture, although it's ssp-related
-	epatch ${FILESDIR}/2.3.3/glibc-2.3.3-frandom-detect.patch
-}
-
-
-src_unpack() {
-	# Check NPTL support _before_ we unpack things to save some time
-	want_nptl && check_nptl_support
-
-	unpack ${PN}-${BASE_PV}.tar.bz2
-
-	# Extract pre-made man pages.
-	# Otherwise we need perl, which is bad (especially for stage1 bootstrap)
-	mkdir -p ${S}/man
-	cd ${S}/man
-	unpack ${PN}-manpages-${NEW_PV}.tar.bz2
-	cd ${S}
-
-	if [ -n "${BRANCH_UPDATE}" ]; then
-		epatch ${DISTDIR}/${PN}-${NEW_PV}-branch-update-${BRANCH_UPDATE}.patch.bz2
-
-		# Snapshot date patch
-		einfo "Patching version to display snapshot date ..."
-		sed -i -e "s:\(#define RELEASE\).*:\1 \"${BRANCH_UPDATE}\":" version.h
-	fi
-	# Version patch
-	sed -i -e "s:\(#define VERSION\).*:\1 \"${NEW_PV}\":" version.h
-
-	# pre-generated info pages
-	unpack glibc-infopages-2.3.4.tar.bz2
-
-	epatch ${FILESDIR}/glibc-sec-hotfix-20040916.patch
-
-	# SSP support in glibc (where it belongs)
-	do_ssp_patches
-
-
-	# PaX-related Patches
-	do_pax_patches
-
-	# disable binutils -as-needed
-	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
-
-	# hardened toolchain/relro/nptl/security/etc fixes
-	do_hardened_fixes
-
-
-	# Arch specific patching
-	use amd64	&& do_arch_amd64_patches
-	use alpha	&& do_arch_alpha_patches
-	use arm		&& do_arch_arm_patches
-	use hppa	&& do_arch_hppa_patches
-	use ia64	&& do_arch_ia64_patches
-	use mips	&& do_arch_mips_patches
-	use ppc		&& do_arch_ppc_patches
-	use ppc64	&& do_arch_ppc64_patches
-	use s390	&& do_arch_s390_patches
-	use sparc	&& do_arch_sparc_patches
-	use x86		&& do_arch_x86_patches
-
-
-	# Remaining patches
-	cd ${S}
-	# fix for http://sources.redhat.com/bugzilla/show_bug.cgi?id=227
-	#epatch ${FILESDIR}/2.3.4/glibc-2.3.4-ld.so-brk-fix.patch
-
-	epatch ${FILESDIR}/2.3.4/glibc-2.3.4-fix-broken-ldd.patch
-
-	# Fix permissions on some of the scripts
-	chmod u+x ${S}/scripts/*.sh
-}
-
-src_compile() {
-	setup_flags
-
-	# These should not be set, else the
-	# zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
-
-	use nls || myconf="${myconf} --disable-nls"
-	use erandom || myconf="${myconf} --disable-dev-erandom"
-
-	if want_nptl && want_tls; then
-		myconf="${myconf} \
-		--enable-add-ons=nptl \
-		--with-tls --with-__thread \
-		--enable-kernel=2.6.0"
-	else
-		myconf="${myconf} --enable-add-ons=linuxthreads --without-__thread"
-	fi
-
-	# this can be tricky sometimes... if it breaks glibc for you, you should
-	# add a block in the want_tls logic. if it breaks linuxthreads, but nptl
-	# works... make sure to add 'use !nptl' to that logic.
-	want_tls || myconf="${myconf} --without-tls"
-	want_tls && myconf="${myconf} --with-tls"
-
-	# some silly people set LD_RUN_PATH and that breaks things.
-	# see bug 19043
-	unset LD_RUN_PATH
-
-	einfo "Configuring GLIBC..."
-	rm -rf ${WORKDIR}/build
-	mkdir -p ${WORKDIR}/build
-	cd ${WORKDIR}/build
-	${S}/configure \
-		--build=${CHOST} \
-		--host=${CCHOST} \
-		--disable-profile \
-		--without-gd \
-		--without-cvs \
-		--with-headers=${ALT_HEADERS} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--libexecdir=/usr/lib/misc \
-		--enable-bind-now \
-		${myconf} || die
-
-	einfo "Building GLIBC..."
-	make PARALLELMFLAGS="${MAKEOPTS}" || die
-}
-
-src_install() {
-	setup_flags
-
-	# These should not be set, else the
-	# zoneinfo do not always get installed ...
-	unset LANGUAGE LANG LC_ALL
-
-	cd ${WORKDIR}/build
-
-	einfo "Installing GLIBC..."
-	make PARALLELMFLAGS="${MAKEOPTS}" \
-		install_root=${D} \
-		install || die
-	# now, strip everything but the thread libs #46186
-	mkdir ${T}/thread-backup
-	mv ${D}/lib/lib{pthread,thread_db}* ${T}/thread-backup/
-	env -uRESTRICT prepallstrip
-	mv ${T}/thread-backup/* ${D}/lib/
-
-	# If librt.so is a symlink, change it into linker script (Redhat)
-	if [ -L "${D}/usr/lib/librt.so" -a "${LIBRT_LINKERSCRIPT}" = "yes" ]; then
-		local LIBRTSO="`cd ${D}/lib; echo librt.so.*`"
-		local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`"
-
-		rm -f ${D}/usr/lib/librt.so
-		cat > ${D}/usr/lib/librt.so <<EOF
-/* GNU ld script
-	librt.so.1 needs libpthread.so.0 to come before libc.so.6*
-	in search scope.  */
-EOF
-		grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so
-		echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \
-			>> ${D}/usr/lib/librt.so
-
-		for x in ${D}/usr/lib/librt.so.[1-9]; do
-			[ -L "${x}" ] && rm -f ${x}
-		done
-	fi
-
-	if ! use build; then
-		cd ${WORKDIR}/build
-
-		if ! has noinfo ${FEATURES} ; then
-			einfo "Installing Info pages..."
-			make PARALLELMFLAGS="${MAKEOPTS}" \
-				install_root=${D} \
-				info -i
-		fi
-
-		setup_locales
-
-		einfo "Installing man pages and docs..."
-		# Install linuxthreads man pages even if nptl is enabled
-		dodir /usr/share/man/man3
-		doman ${S}/man/*.3thr
-
-		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
-
-		cd ${S}
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
-			NEWS NOTES PROJECTS README*
-	else
-		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
-
-		einfo "Installing Timezone data..."
-		make PARALLELMFLAGS="${MAKEOPTS}" \
-			install_root=${D} \
-			timezone/install-others -C ${WORKDIR}/build || die
-	fi
-
-	if use pic && ! use amd64 ; then
-		find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \;
-		find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \;
-		find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \;
-		find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \;
-
-		for i in ${D}/lib/*.map; do
-			mv ${i} ${i%.map}_pic.map
-		done
-	fi
-
-	# Is this next line actually needed or does the makefile get it right?
-	# It previously has 0755 perms which was killing things.
-	fperms 4711 /usr/lib/misc/pt_chown
-
-	# Currently libraries in  /usr/lib/gconv do not get loaded if not
-	# in search path ...
-#	insinto /etc/env.d
-#	doins ${FILESDIR}/03glibc
-
-	rm -f ${D}/etc/ld.so.cache
-
-	# Prevent overwriting of the /etc/localtime symlink.  We'll handle the
-	# creation of the "factory" symlink in pkg_postinst().
-	rm -f ${D}/etc/localtime
-
-	# Some things want this, notably ash.
-	dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a
-
-	# This is our new config file for building locales
-	insinto /etc
-	doins ${FILESDIR}/locales.build
-
-	# this whole section is useless, it fails if sandbox is LOADED, not if it's
-	# enabled. but forcing sandbox not to load isnt an option...
-	if use makecheck; then
-		local OLD_SANDBOX_ON="${SANDBOX_ON}"
-		# make check will fail if sandbox is enabled.  Do not do it
-		# globally though, else we might fail to find sandbox violations ...
-		SANDBOX_ON="0"
-		do_makecheck
-		SANDBOX_ON="${OLD_SANDBOX_ON}"
-	fi
-}
-
-fix_lib64_symlinks() {
-	# the original Gentoo/AMD64 devs decided that since 64bit is the native
-	# bitdepth for AMD64, lib should be used for 64bit libraries. however,
-	# this ignores the FHS and breaks multilib horribly... especially
-	# since it wont even work without a lib64 symlink anyways. *rolls eyes*
-	# see bug 59710 for more information.
-	# Travis Tilley <lv@gentoo.org> (08 Aug 2004)
-	if [ -L ${ROOT}/lib64 ] ; then
-		ewarn "removing /lib64 symlink and moving lib to lib64..."
-		ewarn "dont hit ctrl-c until this is done"
-		addwrite ${ROOT}/
-		rm ${ROOT}/lib64
-		# now that lib64 is gone, nothing will run without calling ld.so
-		# directly. luckily the window of brokenness is almost non-existant
-		/lib/ld-linux-x86-64.so.2 /bin/mv ${ROOT}/lib ${ROOT}/lib64
-		# all better :)
-		ldconfig
-		ln -s lib64 ${ROOT}/lib
-		einfo "done! :-)"
-		einfo "fixed broken lib64/lib symlink in ${ROOT}"
-	fi
-	if [ -L ${ROOT}/usr/lib64 ] ; then
-		addwrite ${ROOT}/usr
-		rm ${ROOT}/usr/lib64
-		mv ${ROOT}/usr/lib ${ROOT}/usr/lib64
-		ln -s lib64 ${ROOT}/usr/lib
-		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr"
-	fi
-	if [ -L ${ROOT}/usr/X11R6/lib64 ] ; then
-		addwrite ${ROOT}/usr/X11R6
-		rm ${ROOT}/usr/X11R6/lib64
-		mv ${ROOT}/usr/X11R6/lib ${ROOT}/usr/X11R6/lib64
-		ln -s lib64 ${ROOT}/usr/X11R6/lib
-		einfo "fixed broken lib64/lib symlink in ${ROOT}/usr/X11R6"
-	fi
-}
-
-pkg_preinst() {
-	# PPC64+others may want to eventually be added to this logic if they
-	# decide to be multilib compatible and FHS compliant. note that this 
-	# chunk of FHS compliance only applies to 64bit archs where 32bit
-	# compatibility is a major concern (not IA64, for example).
-	use amd64 && [ "$(get_libdir)" == "lib64" ] && fix_lib64_symlinks
-}
-
-pkg_postinst() {
-	# Correct me if I am wrong here, but my /etc/localtime is a file
-	# created by zic ....
-	# I am thinking that it should only be recreated if no /etc/localtime
-	# exists, or if it is an invalid symlink.
-	#
-	# For invalid symlink:
-	#   -f && -e  will fail
-	#   -L will succeed
-	#
-	if [ ! -e "${ROOT}/etc/localtime" ]; then
-		echo "Please remember to set your timezone using the zic command."
-		rm -f ${ROOT}/etc/localtime
-		ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime
-	fi
-
-	if [ -x "${ROOT}/usr/sbin/iconvconfig" ]; then
-		# Generate fastloading iconv module configuration file.
-		${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT}
-	fi
-
-	if [ ! -e "${ROOT}/ld.so.1" ] && use ppc64
-	then
-		pushd ${ROOT}
-		cd ${ROOT}/lib
-		ln -s ld64.so.1 ld.so.1
-		popd
-	fi
-
-	# Reload init ...
-	if [ "${ROOT}" = "/" ]; then
-		/sbin/init U &> /dev/null
-	fi
-}