add newer version of amd64 optimized strings, add symlinks to abi dirs for /usr/lib/locale #125818, and grab patch from upstream for arm eabi

(Portage version: 2.1_pre9-r4)

2 files changed, 21 insertions, 9 deletions

diff --git a/sys-libs/glibc/files/digest-glibc-2.4-r2 b/sys-libs/glibc/files/digest-glibc-2.4-r2
index 8e320aa616b1..10774d56d48b 100644
--- a/sys-libs/glibc/files/digest-glibc-2.4-r2
+++ b/sys-libs/glibc/files/digest-glibc-2.4-r2
@@ -1,6 +1,6 @@
-MD5 06ab55162034cd5d20968082eaf9800f glibc-2.4-patches-1.7.tar.bz2 114770
-RMD160 49f286851335a080465a7ced115983ad6c0c8864 glibc-2.4-patches-1.7.tar.bz2 114770
-SHA256 91d28ab2bdfe178542271e9f7c4b62e3fe35b6d756622c63a53210950c450702 glibc-2.4-patches-1.7.tar.bz2 114770
+MD5 e70313e71cd7e27b9e24ca9c1651b96b glibc-2.4-patches-1.8.tar.bz2 117335
+RMD160 6ecc14c242c714d65e6912611aa1afc68fb196c0 glibc-2.4-patches-1.8.tar.bz2 117335
+SHA256 f15f84921be4e2596e5e9b30e2490c5ec3d9044fdbb533f0561760bc1a4e2c99 glibc-2.4-patches-1.8.tar.bz2 117335
 MD5 7e9a88dcd41fbc53801dbe5bdacaf245 glibc-2.4.tar.bz2 15202445
 RMD160 ee2712a0e6fab8e086958c1f23221f8d07af3de1 glibc-2.4.tar.bz2 15202445
 SHA256 27aaaaa78b4ab5da76bb29385dc9be087ba7b855a9102eaaa78ce3ec5e2e7fcd glibc-2.4.tar.bz2 15202445
diff --git a/sys-libs/glibc/glibc-2.4-r2.ebuild b/sys-libs/glibc/glibc-2.4-r2.ebuild
index a9f28bcb63ad..4935b0701850 100644
--- a/sys-libs/glibc/glibc-2.4-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.4-r2.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-r2.ebuild,v 1.16 2006/04/25 02:48:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r2.ebuild,v 1.17 2006/04/26 05:13:12 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -27,7 +27,7 @@ GLIBC_MANPAGE_VERSION="none"
 GLIBC_INFOPAGE_VERSION="none"
 
 # Gentoo patchset
-PATCH_VER="1.7"
+PATCH_VER="1.8"
 
 # Fedora addons (like c_stubs)
 # sniped from RHEL's glibc-2.4-4.src.rpm
@@ -41,6 +41,11 @@ PPC_CPU_ADDON_VER="0.01"
 PPC_CPU_ADDON_TARBALL="glibc-powerpc-cpu-addon-v${PPC_CPU_ADDON_VER}.tgz"
 PPC_CPU_ADDON_URI="http://penguinppc.org/dev/glibc/${PPC_CPU_ADDON_TARBALL}"
 
+# LinuxThreads addon
+LT_VER="" #20060501
+LT_TARBALL="glibc-linuxthreads-${LT_VER}.tar.bz2"
+LT_URI="ftp://sources.redhat.com/pub/glibc/snapshots/${LT_TARBALL}"
+
 GENTOO_TOOLCHAIN_BASE_URI="mirror://gentoo"
 GENTOO_TOOLCHAIN_DEV_URI="http://dev.gentoo.org/~azarah/glibc/XXX http://dev.gentoo.org/~vapier/dist/XXX"
 
@@ -154,6 +159,8 @@ get_glibc_src_uri() {
 			${GENTOO_TOOLCHAIN_DEV_URI//XXX/glibc-infopages-${GLIBC_INFOPAGE_VERSION:-${GLIBC_RELEASE_VER}}.tar.bz2}"
 	fi
 
+	[[ -n ${LT_SNAP} ]] && GLIBC_SRC_URI="${GLIBC_SRC_URI} ${LT_URI}"
+
 	GLIBC_SRC_URI="${GLIBC_SRC_URI} ${FEDORA_URI}"
 	GLIBC_SRC_URI="${GLIBC_SRC_URI} ${PPC_CPU_ADDON_URI}"
 
@@ -430,7 +437,6 @@ toolchain-glibc_src_install() {
 	fi
 
 	# Everything past this point just needs to be done once ...
-	# don't waste time building locale files twice ...
 	is_final_abi || return 0
 
 	# Make sure the non-native interp can be found on multilib systems
@@ -463,6 +469,15 @@ toolchain-glibc_src_install() {
 	insinto /etc
 	doins locale.gen || die
 
+	# Make sure all the ABI's can find the locales and so we only
+	# have to generate one set
+	keepdir /usr/$(get_libdir)/locale
+	for l in $(get_all_libdirs) ; do
+		if [[ ! -e ${D}/usr/${l}/locale ]] ; then
+			dosym /usr/$(get_libdir)/locale /usr/${l}/locale
+		fi
+	done
+
 	if ! has noinfo ${FEATURES} && [[ ${GLIBC_INFOPAGE_VERSION} != "none" ]] ; then
 		einfo "Installing info pages..."
 
@@ -1088,9 +1103,6 @@ pkg_setup() {
 src_unpack() {
 	setup_env
 
-	# 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"
-
 	toolchain-glibc_src_unpack
 
 	# Backwards SSP support