diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-04-18 20:45:23 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-04-18 20:45:23 +0000 |
| commit | 9c54900b93787375057086f5d296fee67600c5b6 (patch) | |
| tree | a877f5e0acd95f1fcdb11d7546da0fe3f70454eb | |
| parent | Stable on sparc. (diff) | |
| download | historical-9c54900b93787375057086f5d296fee67600c5b6.tar.gz historical-9c54900b93787375057086f5d296fee67600c5b6.tar.bz2 historical-9c54900b93787375057086f5d296fee67600c5b6.zip | |
allow $EPATCH_OPTS to override #33636
| -rw-r--r-- | eclass/eutils.eclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 3e21dd4fcfb4..9cc8820372e8 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.87 2004/04/01 20:50:43 iggy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.88 2004/04/18 20:45:23 vapier Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -260,7 +260,7 @@ epatch() { fi echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} - echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} + echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} @@ -277,7 +277,7 @@ epatch() { fi fi - if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 + if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 then draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real @@ -285,7 +285,7 @@ epatch() { echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real - cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 + cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 if [ "$?" -ne 0 ] then |