summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-05-06 04:14:17 +0000
committerMike Frysinger <vapier@gentoo.org>2005-05-06 04:14:17 +0000
commit29e198c625a891d21f8277c72eaa5bfddfd0371b (patch)
tree29eebb2bd42f87cfbb3858b2cc604a5f51864507 /eclass/eutils.eclass
parentFix building with newer binutils and clean up the src_install to use Gentoo s... (diff)
downloadgentoo-2-29e198c625a891d21f8277c72eaa5bfddfd0371b.tar.gz
gentoo-2-29e198c625a891d21f8277c72eaa5bfddfd0371b.tar.bz2
gentoo-2-29e198c625a891d21f8277c72eaa5bfddfd0371b.zip
enable --no-backup-if-mismatch by default in epatch
Diffstat (limited to 'eclass/eutils.eclass')
-rw-r--r--eclass/eutils.eclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 1ae7a4579607..6c76eb128ff1 100644
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.169 2005/05/04 22:06:36 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.170 2005/05/06 04:14:17 vapier Exp $
#
# Author: Martin Schlemmer <azarah@gentoo.org>
#
@@ -120,7 +120,8 @@ EPATCH_SOURCE="${WORKDIR}/patch"
EPATCH_SUFFIX="patch.bz2"
# Default options for patch
# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
-EPATCH_OPTS="-g0"
+# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
+EPATCH_OPTS="-g0 --no-backup-if-mismatch"
# List of patches not to apply. Not this is only file names,
# and not the full path ..
EPATCH_EXCLUDE=""