Moved Lv's latest patch into do_arch{ia64|amd64}_patches() to avoid breakage for...

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index c3ff8176869054a566334a1a54c0d7c57bcf146e..1fa902eefe2c5fadcb88376c777f675511763449 100644 (file)
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,10 @@
 # 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.274 2004/10/13 00:35:08 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.275 2004/10/13 17:16:12 gmsoft Exp $
+
+  13 Oct 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
+  Moved Lv's latest patch into do_arch{ia64|amd64}_patches() to avoid breakage
+  for other arches.
 
   13 Oct 2004; Guy Martin <gmsoft@gentoo.org> glibc-2.3.4.20040808-r1.ebuild:
   Added unset of EPATCH_OPTS in do_arch_hppa_patches to fix patching at later

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 48832b8d0a04fe95ae907fed98d15b953c2f78ec..c79ceabbd6dafaf38bff5a6c0cc8ae98e61da6b6 100644 (file)
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,11 +1,11 @@
-MD5 67d6bdcdad0b4b90a1dbe08e3099a619 ChangeLog 56805
+MD5 d84fa79a8d382391bdea0af555ca3a6e ChangeLog 56983
 MD5 7cf88dee2671dcc30659d07241b8d918 glibc-2.2.5-r9.ebuild 10915
 MD5 daf5c4924c0a0ccc6e55f7588b1b4d52 glibc-2.3.3.20040420-r2.ebuild 21765
 MD5 af6f1491a70a6ee80e8d867d8ee0f98f glibc-2.3.4.20040619-r2.ebuild 20997
 MD5 03a3adcb2e3850069836fccbacf1868e glibc-2.3.4.20041006.ebuild 25787
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 MD5 3603fa6448052edcf78a329d10746461 glibc-2.3.2-r12.ebuild 20530
-MD5 e4654bd323cd022d6d5fde3e5864e4f6 glibc-2.3.4.20040808-r1.ebuild 22194
+MD5 8b57470f4f20fe2c5012000d49adc632 glibc-2.3.4.20040808-r1.ebuild 22453
 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143
 MD5 42af7e35fe2404a49954f91fd1aee891 files/digest-glibc-2.3.3.20040420-r2 312
 MD5 470f57fe18dd0a94cb4a4d6cf51528af files/digest-glibc-2.3.4.20040619-r2 307

diff --git a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
index d0ea347e0f84c24379837447c034042d65cce79f..111862fff96150c62cd735a08300cdd4d9df72f4 100644 (file)
--- a/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808-r1.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-r1.ebuild,v 1.5 2004/10/13 00:35:08 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild,v 1.6 2004/10/13 17:16:12 gmsoft Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -290,6 +290,11 @@ do_arch_amd64_patches() {
        # 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
+
+       # fixes compiling with the new binutils on at least amd64 and ia64.
+       # see http://sources.redhat.com/ml/libc-alpha/2004-08/msg00076.html
+       # and http://bugs.gentoo.org/show_bug.cgi?id=66396 for more info.
+       epatch ${FILESDIR}/2.3.4/glibc-2.3.4-res_init.patch
 }
 
 
@@ -342,6 +347,12 @@ do_arch_ia64_patches() {
        #   http://sources.redhat.com/ml/libc-alpha/2003-09/msg00165.html
 
 #      epatch ${FILESDIR}/2.3.2/${LOCAL_P}-ia64-LOAD_ARGS-fixup.patch
+
+
+       # fixes compiling with the new binutils on at least amd64 and ia64.
+       # see http://sources.redhat.com/ml/libc-alpha/2004-08/msg00076.html
+       # and http://bugs.gentoo.org/show_bug.cgi?id=66396 for more info.
+       epatch ${FILESDIR}/2.3.4/glibc-2.3.4-res_init.patch
 }
 
 
@@ -509,7 +520,6 @@ src_unpack() {
        use sparc       && do_arch_sparc_patches
        use x86         && do_arch_x86_patches
 
-
        # Remaining patches
        cd ${S}
 
@@ -522,11 +532,6 @@ src_unpack() {
        # Improved handled temporary files. bug #66358
        epatch ${FILESDIR}/2.3.3/${PN}-2.3.3-tempfile.patch
 
-       # fixes compiling with the new binutils on at least amd64 and ia64.
-       # see http://sources.redhat.com/ml/libc-alpha/2004-08/msg00076.html
-       # and http://bugs.gentoo.org/show_bug.cgi?id=66396 for more info.
-       epatch ${FILESDIR}/2.3.4/glibc-2.3.4-res_init.patch
-
        # Fix permissions on some of the scripts
        chmod u+x ${S}/scripts/*.sh
 }