diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-07-20 05:46:46 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-07-20 05:46:46 +0000 |
| commit | c0df2e37a8dd20942d5bbb303a9c0d65ebb330d5 (patch) | |
| tree | 93ddea2e6e95ce326a019372bdaedf7588a71f0c | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c0df2e37a8dd20942d5bbb303a9c0d65ebb330d5.tar.gz gentoo-2-c0df2e37a8dd20942d5bbb303a9c0d65ebb330d5.tar.bz2 gentoo-2-c0df2e37a8dd20942d5bbb303a9c0d65ebb330d5.zip | |
epatch: use EPATCH_SOURCE as a [relative] search dir even when patches are specified on the command line
| -rw-r--r-- | eclass/eutils.eclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 1d686e179341..ca429c070704 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.358 2011/07/08 11:35:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.359 2011/07/20 05:46:46 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -252,6 +252,11 @@ epatch() { # Some people like to make dirs of patches w/out suffixes (vim) set -- "$1"/*${EPATCH_SUFFIX:+."${EPATCH_SUFFIX}"} + elif [[ -f ${EPATCH_SOURCE}/$1 ]] ; then + # Re-use EPATCH_SOURCE as a search dir + epatch "${EPATCH_SOURCE}/$1" + return $? + else # sanity check ... if it isn't a dir or file, wtf man ? [[ $# -ne 0 ]] && EPATCH_SOURCE=$1 |