From fc32d260167bd6b1446d1c9a1fefd18beff566f5 Mon Sep 17 00:00:00 2001 From: Guy Martin Date: Wed, 13 Oct 2004 00:35:08 +0000 Subject: [PATCH] Added unset of EPATCH_OPTS in do_arch_hppa_patches to fix patching at later stage. --- sys-libs/glibc/ChangeLog | 6 +++++- sys-libs/glibc/Manifest | 4 ++-- sys-libs/glibc/glibc-2.3.4.20040808-r1.ebuild | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 8e77e8a57b62..c3ff81768690 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.273 2004/10/12 11:56:25 gmsoft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.274 2004/10/13 00:35:08 gmsoft Exp $ + + 13 Oct 2004; Guy Martin glibc-2.3.4.20040808-r1.ebuild: + Added unset of EPATCH_OPTS in do_arch_hppa_patches to fix patching at later + stage. 12 Oct 2004; Guy Martin glibc-2.3.4.20040808-r1.ebuild: Stable on hppa. diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 511f7737b453..48832b8d0a04 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,11 +1,11 @@ -MD5 d1a50936599b624aa69c4b3da49ca3e7 ChangeLog 56639 +MD5 67d6bdcdad0b4b90a1dbe08e3099a619 ChangeLog 56805 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 e8399c7b2ed4fcca03abe2ae665205f2 glibc-2.3.4.20040808-r1.ebuild 22174 +MD5 e4654bd323cd022d6d5fde3e5864e4f6 glibc-2.3.4.20040808-r1.ebuild 22194 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 d137049a6116..d0ea347e0f84 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.4 2004/10/12 11:56:25 gmsoft Exp $ +# $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 $ inherit eutils flag-o-matic gcc @@ -325,6 +325,8 @@ do_arch_hppa_patches() { epatch ${i} done + unset EPATCH_OPTS + use hardened && epatch ${FILESDIR}/2.3.4/glibc-2.3.4-hppa-hardened-disable__init_arrays.patch } -- 2.26.2