add back in support for the c_stubs addon from fedora and add optional support for optimized amd64 libm patches

(Portage version: 2.1_pre6-r3)

2 files changed, 28 insertions, 22 deletions

diff --git a/sys-libs/glibc/files/digest-glibc-2.4-r1 b/sys-libs/glibc/files/digest-glibc-2.4-r1
index 7a51d17ccbd7..4491cdd88b2b 100644
--- a/sys-libs/glibc/files/digest-glibc-2.4-r1
+++ b/sys-libs/glibc/files/digest-glibc-2.4-r1
@@ -1,9 +1,12 @@
-MD5 1e07aec28e146b0c31ede9068365b06a glibc-2.4-patches-1.2.tar.bz2 27947
-RMD160 929c608268dc57b52c5e0124facef9454ede026e glibc-2.4-patches-1.2.tar.bz2 27947
-SHA256 32500c45f58f0652603f6ac4d6af05c1638b302ae103ba2711884cdacf350706 glibc-2.4-patches-1.2.tar.bz2 27947
+MD5 a367eb55060cb285a8b73d68cf031a36 glibc-2.4-patches-1.3.tar.bz2 106325
+RMD160 44c515536754d10be15731285842de7638136d13 glibc-2.4-patches-1.3.tar.bz2 106325
+SHA256 76b74f08a3ba10f219af2221951b0d402fc78f08a4613767c3a5ad4937c70d93 glibc-2.4-patches-1.3.tar.bz2 106325
 MD5 7e9a88dcd41fbc53801dbe5bdacaf245 glibc-2.4.tar.bz2 15202445
 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 glibc-2.4.tar.bz2 15202445
 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd glibc-2.4.tar.bz2 15202445
+MD5 f4732d93d3749c864b1909e9f9d39524 glibc-fedora-20060306T1239.tar.bz2 728767
+RMD160 d59c8601340fde01e3a5a5b0613d3051a7e8fd9c glibc-fedora-20060306T1239.tar.bz2 728767
+SHA256 37794c31136164c41d0495788255badc23e7b6c347a6c97dfb4bf75e028cec29 glibc-fedora-20060306T1239.tar.bz2 728767
 MD5 e2d892b40d654c523ab26a26b7dd86a1 glibc-libidn-2.4.tar.bz2 102305
 RMD160 76b2e15e7613c4ac8db3bf90e90929c0e369ab04 glibc-libidn-2.4.tar.bz2 102305
 SHA256 2f29ec2b2b2f75f787a1eed8fdea20aff212dc3bad97651ca376914c49181977 glibc-libidn-2.4.tar.bz2 102305
diff --git a/sys-libs/glibc/glibc-2.4-r1.ebuild b/sys-libs/glibc/glibc-2.4-r1.ebuild
index 2e0daaba97d2..123feb55e507 100644
--- a/sys-libs/glibc/glibc-2.4-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r1.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.4-r1.ebuild,v 1.1 2006/03/17 04:34:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r1.ebuild,v 1.2 2006/03/18 00:53:22 vapier Exp $
 
 # TODO:
 #  - fix warning from glibc build system:
@@ -28,24 +28,20 @@ KEYWORDS="-* ~amd64 ~x86"
 
 BRANCH_UPDATE=""
 
-# From linuxthreads/man
+# Generated man pages
 GLIBC_MANPAGE_VERSION="none"
 
-# From manual
+# Generated stuff in manual subdir
 GLIBC_INFOPAGE_VERSION="none"
 
 # Gentoo patchset
-PATCH_VER="1.2"
+PATCH_VER="1.3"
 
-# C Stubbs addon (contained in fedora, so ignoring)
-#CSTUBS_VER="2.1.2"
-#CSTUBS_TARBALL="c_stubs-${CSTUBS_VER}.tar.bz2"
-#CSTUBS_URI="mirror://gentoo/${CSTUBS_TARBALL}"
-
-# 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="mirror://gentoo/${FEDORA_TARBALL}"
+# Fedora addons (like c_stubs)
+# sniped from RHEL's glibc-2.4-4.src.rpm
+FEDORA_VER="20060306T1239"
+FEDORA_TARBALL="glibc-fedora-${FEDORA_VER}.tar.bz2"
+FEDORA_URI="mirror://gentoo/${FEDORA_TARBALL}"
 
 GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc"
@@ -168,10 +164,6 @@ get_glibc_src_uri() {
 				${GENTOO_TOOLCHAIN_DEV_URI}/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2"
 	fi
 
-	if [[ -n ${CSTUBS_URI} ]] ; then
-		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${CSTUBS_URI}"
-	fi
-
 	if [[ -n ${FEDORA_URI} ]] ; then
 		GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
 	fi
@@ -194,8 +186,15 @@ toolchain-glibc_src_unpack() {
 	unpack glibc-libidn-${GLIBC_RELEASE_VER}.tar.bz2 && mv glibc-libidn-${GLIBC_RELEASE_VER} libidn
 	unpack glibc-ports-${GLIBC_RELEASE_VER}.tar.bz2 && mv glibc-ports-${GLIBC_RELEASE_VER} ports
 
-	[[ -n ${CSTUBS_TARBALL} ]] && unpack ${CSTUBS_TARBALL}
-	[[ -n ${FEDORA_TARBALL} ]] && unpack ${FEDORA_TARBALL}
+	if [[ -n ${FEDORA_TARBALL} ]] ; then
+		# only pull out the stuff we actually want
+		mkdir "${WORKDIR}"/fedora
+		cd "${WORKDIR}"/fedora || die
+		unpack ${FEDORA_TARBALL}
+		mv c_stubs "${S}"/ || die
+		cd "${S}"
+		rm -r "${WORKDIR}"/fedora
+	fi
 
 	if [[ -n ${PATCH_VER} ]] ; then
 		cd "${WORKDIR}"
@@ -232,6 +231,8 @@ toolchain-glibc_src_unpack() {
 		ARCH=$(tc-arch) \
 		epatch "${WORKDIR}"/patches
 	fi
+
+	gnuconfig_update
 }
 
 toolchain-glibc_src_compile() {
@@ -1162,6 +1163,8 @@ src_unpack() {
 
 	# Optimized amd64 funcs appear to be unstable, enable at your own risk !
 	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6905_all_glibc-2.4-amd64-string.patch"
+	# These should be pretty safe though ...
+	GLIBC_PATCH_EXCLUDE="${GLIBC_PATCH_EXCLUDE} 6901_all_2.4-new-libm-20060314.patch 6902_all_2.4-new-libm-s_ceil.patch"
 
 	toolchain-glibc_src_unpack