this release should be fixed for bootstrap: it needs pre-generated info pages right along with the man pages we already use

4 files changed, 25 insertions, 17 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 3e25106fdf69..639069b65fde 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.181 2004/06/09 03:19:33 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.182 2004/06/09 12:30:19 lv Exp $
+
+  09 Jun 2004; Travis Tilley <lv@gentoo.org> glibc-2.3.4.20040605.ebuild:
+  the 2.3.4 release needs pre-generated info pages to bootstrap without perl,
+  unlike previous releases that just needed pre-generated man pages. this
+  release is now usable from stage1.
 
   08 Jun 2004; <solar@gentoo.org> glibc-2.3.3.20040420.ebuild:
   glibc-2.3.3.20040420 marked stable for upcoming release
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 4c27dea9f855..49a943ccbc1b 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -4,7 +4,7 @@ MD5 00f71cf6b178a50ca7792b65ebc1f5bc glibc-2.3.3_pre20040207.ebuild 19593
 MD5 488e8b7878e9e8a11be594b3e16ee0f4 glibc-2.3.3_pre20031210.ebuild 19014
 MD5 48cba020ef55666023d1be7c15147e44 glibc-2.3.3_pre20040529.ebuild 21579
 MD5 aaa34484bbb3516cc6b220d8345a60d7 glibc-2.3.2-r10.ebuild 19417
-MD5 43b7b1e001a45accfa04bc41da042415 glibc-2.3.4.20040605.ebuild 16293
+MD5 bd52253f32929ec00a49c659e9f24fcf glibc-2.3.4.20040605.ebuild 16302
 MD5 67753229fcc7169eb9e648263dfda5f4 glibc-2.3.3_pre20040117.ebuild 18525
 MD5 686df5ad46c050c1dddeed661b3917b9 glibc-2.3.2-r2.ebuild 17967
 MD5 6c9ed0aa642c902139be296250465829 glibc-2.3.1-r5.ebuild 10718
@@ -24,7 +24,7 @@ MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296
 MD5 2d5306ef875573750af642a9f93b634a files/digest-glibc-2.3.2-r9 312
 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158
 MD5 49374df695743477ccba680199a0ff87 files/digest-glibc-2.3.3_pre20040117-r1 312
-MD5 125993bba6afa2b0bca914ad745c5d50 files/digest-glibc-2.3.4.20040605 75
+MD5 e6e5134e81215f7c200930cf04f10b50 files/digest-glibc-2.3.4.20040605 150
 MD5 52cfc7627fc62dfb26d8d163aac361f6 files/glibc-2.2.2-test-lfs-timeout.patch 320
 MD5 b712a49b5113fccb4c8b0ada2a30d390 files/glibc-manpages-2.2.5.tar.bz2 14610
 MD5 184eddb92615fb991dce41b9edbfa690 files/glibc-manpages-2.3.2.tar.bz2 14700
diff --git a/sys-libs/glibc/files/digest-glibc-2.3.4.20040605 b/sys-libs/glibc/files/digest-glibc-2.3.4.20040605
index 640ad95e4766..0dce5380fd56 100644
--- a/sys-libs/glibc/files/digest-glibc-2.3.4.20040605
+++ b/sys-libs/glibc/files/digest-glibc-2.3.4.20040605
@@ -1 +1,2 @@
 MD5 b88086b30c6df8dafb983efed80f5a22 glibc-2.3.4.20040605.tar.bz2 13728433
+MD5 eabe1f4779fc27cde985b0713f930827 glibc-infopages-2.3.4.tar.bz2 1175502
diff --git a/sys-libs/glibc/glibc-2.3.4.20040605.ebuild b/sys-libs/glibc/glibc-2.3.4.20040605.ebuild
index 6819514f055b..c58d4ea6b539 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040605.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040605.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040605.ebuild,v 1.7 2004/06/09 04:09:29 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040605.ebuild,v 1.8 2004/06/09 12:30:19 lv Exp $
 
 IUSE="nls pic build nptl erandom hardened makecheck multilib"
 
@@ -38,11 +38,12 @@ export CXXFLAGS="${CFLAGS}"
 export LDFLAGS="${LDFLAGS//-Wl,--relax}"
 
 DESCRIPTION="GNU libc6 (also called glibc2) C library"
-SRC_URI="http://dev.gentoo.org/~lv/${P}.tar.bz2"
+SRC_URI="http://dev.gentoo.org/~lv/${P}.tar.bz2
+		 http://dev.gentoo.org/~lv/glibc-infopages-2.3.4.tar.bz2"
 HOMEPAGE="http://sources.redhat.com/glibc/"
 
 #KEYWORDS="~x86 ~mips ~sparc ~amd64 -hppa ~ia64 ~ppc" # breaks on ~alpha
-KEYWORDS="-*"
+KEYWORDS="-* ~amd64"
 
 SLOT="2.2"
 LICENSE="LGPL-2"
@@ -55,7 +56,7 @@ 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
-	!mips? ( nptl? ( =sys-kernel/linux-headers-2.6* ) )
+	nptl? ( =sys-kernel/linux-headers-2.6* )
 	nls? ( sys-devel/gettext )"
 RDEPEND="virtual/os-headers
 	sys-apps/baselayout
@@ -105,6 +106,9 @@ setup_flags() {
 	fi
 
 	# temporary fix for a few gcc 3.4 related problems
+	# note: the problem this fixes should no longer exist as of gcc
+	# 3.4.0-r6. i'll keep this around for a short time longer since not
+	# everyone recompiles their compiler at every upgrade...
 	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
 	then
 		filter-flags -funit-at-a-time
@@ -227,7 +231,8 @@ src_unpack() {
 
 	# Extract pre-made man pages.  Otherwise we need perl, which is a no-no.
 	mkdir -p ${S}/man; cd ${S}/man
-	want_nptl || tar xjf ${FILESDIR}/glibc-manpages-2.3.2.tar.bz2
+	tar xjf ${FILESDIR}/glibc-manpages-2.3.2.tar.bz2
+	cd ${S} ; unpack glibc-infopages-2.3.4.tar.bz2
 
 	cd ${S}
 
@@ -277,6 +282,10 @@ src_unpack() {
 	# *** PaX related patches ends here ***
 	#
 
+	# Sanity check the forward and backward chunk pointers in the
+	# unlink() macro used by Doug Lea's implementation of malloc(3).
+	cd ${S}; epatch ${FILESDIR}/2.3.3/glibc-2.3.3-owl-malloc-unlink-sanity-check.diff
+
 	# We do not want name_insert() in iconvconfig.c to be defined inside
 	# write_output() as it causes issues with trampolines/PaX.
 	#cd ${S}; epatch ${FILESDIR}/2.3.2/${PN}-2.3.2-iconvconfig-name_insert.patch
@@ -337,15 +346,8 @@ src_unpack() {
 	# Fix permissions on some of the scripts
 	chmod u+x ${S}/scripts/*.sh
 
-	# disable -z relro
-	#use hardened || sed -e 's/^have-z-relro.*/have-z-relro = no/' -i ${S}/config.make.in
-	# disables building nscd as pie
-	#use hardened || sed -e 's/^have-fpie.*/have-fpie = no/' -i ${S}/config.make.in
-	# disable binutils -as-needed, useful, if glibc should not depend on libgcc_s.so
+	# disable binutils -as-needed
 	sed -e 's/^have-as-needed.*/have-as-needed = no/' -i ${S}/config.make.in
-	# disable execstack (the patch is used by rh for gcc < 3.3.3)
-	#use hardened || epatch ${FILESDIR}/2.3.3/glibc-execstack-disable.patch
-	#use hardened || sed -e 's/^ASFLAGS-config.*/ASFLAGS-config =/' -i ${S}/config.make.in
 	# mandatory, if binutils supports relro and the kernel is pax/grsecurity enabled
 	# solves almost all segfaults building the locale files on grsecurity enabled kernels
 	use build && sed -e 's/^LDFLAGS-rtld += $(relro.*/LDFLAGS-rtld += -Wl,-z,norelro/' -i ${S}/Makeconfig
@@ -471,7 +473,7 @@ EOF
 			timezone/install-others -C ${WORKDIR}/build || die
 	fi
 
-	if [ "`use pic`" ]
+	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 \;