diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-01-14 04:52:35 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-01-14 04:52:35 +0000 |
| commit | 3ad802bc9ba50e1c312097349d2a6a67cb51dfcc (patch) | |
| tree | fcc222d8b330ccf87117b9ae6f0f31d438f34c57 /eclass/eutils.eclass | |
| parent | Flip back to internal libcroco to avoid glib/gettext circular deps #204851 by... (diff) | |
| download | gentoo-2-3ad802bc9ba50e1c312097349d2a6a67cb51dfcc.tar.gz gentoo-2-3ad802bc9ba50e1c312097349d2a6a67cb51dfcc.tar.bz2 gentoo-2-3ad802bc9ba50e1c312097349d2a6a67cb51dfcc.zip | |
handle whitespace in epatch/epunt_cxx better #205339 by Santiago M. Mola
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 16aa18994f75..2ee83b3c4624 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.293 2007/11/20 22:32:01 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.294 2008/01/14 04:52:35 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -145,8 +145,7 @@ epatch() { local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" fi else - if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ] - then + if [[ ! -d ${EPATCH_SOURCE} ]] || [[ -n $1 ]] ; then if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] then EPATCH_SOURCE="$1" @@ -1722,8 +1721,8 @@ epunt_cxx() { [[ -z ${dir} ]] && dir=${S} ebegin "Removing useless C++ checks" local f - for f in $(find ${dir} -name configure) ; do - patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null + find "${dir}" -name configure | while read f ; do + patch --no-backup-if-mismatch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null done eend 0 } |