diff options
| author |   Guy Martin <gmsoft@gentoo.org> | 2004-10-13 17:16:12 +0000 |
|---|---|---|
| committer | Guy Martin <gmsoft@gentoo.org> | 2004-10-13 17:16:12 +0000 |
| commit | 855f1cc35710f6ab908709f7ace7747630ef23e4 (patch) | |
| tree | 9a5920ae3a4e00b3e89ea8b44b9b7adcee210e57 /sys-libs | |
| parent | version bump (Manifest recommit) (diff) | |
| download | gentoo-2-855f1cc35710f6ab908709f7ace7747630ef23e4.tar.gz gentoo-2-855f1cc35710f6ab908709f7ace7747630ef23e4.tar.bz2 gentoo-2-855f1cc35710f6ab908709f7ace7747630ef23e4.zip | |
Moved Lv's latest patch into do_arch{ia64|amd64}_patches() to avoid breakage for other arches.
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild | 19 |
2 files changed, 17 insertions, 8 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index c3ff81768690..1fa902eefe2c 100644 --- 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/glibc-2.3.4.20040808-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild index d0ea347e0f84..111862fff961 100644 --- 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 } |