diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-03-09 17:55:39 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-03-09 17:55:39 +0000 |
| commit | 096aec179e61003d4a8a37e7a51d20513c7d8c31 (patch) | |
| tree | 8f90df7eade6d7821f9b32b99758532e2f90ad43 | |
| parent | Updated ChangeLog to reflect my change to package.mask. (diff) | |
| download | gentoo-2-096aec179e61003d4a8a37e7a51d20513c7d8c31.tar.gz gentoo-2-096aec179e61003d4a8a37e7a51d20513c7d8c31.tar.bz2 gentoo-2-096aec179e61003d4a8a37e7a51d20513c7d8c31.zip | |
Fix epunt_cxx not to subshell.
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/eutils.eclass | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 8aa80da6dba1..5e4a881d0604 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.725 2013/03/09 13:52:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.726 2013/03/09 17:55:39 mgorny Exp $ + + 09 Mar 2013; Michał Górny <mgorny@gentoo.org> eutils.eclass: + Fix epunt_cxx not to subshell. 09 Mar 2013; Michał Górny <mgorny@gentoo.org> python-r1.eclass: Clean up redundant USE flag check calls, replace them with a single call in diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 587bc10b4521..04f95ed84a16 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.411 2013/02/26 14:36:40 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.412 2013/03/09 17:55:39 mgorny Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1270,11 +1270,11 @@ epunt_cxx() { [[ -z ${dir} ]] && dir=${S} ebegin "Removing useless C++ checks" local f any_found - find "${dir}" -name configure | while read f ; do + while IFS= read -r -d '' f; do patch --no-backup-if-mismatch -p0 "${f}" \ "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null \ && any_found=1 - done + done < <(find "${dir}" -name configure -print0) if [[ -z ${any_found} ]]; then eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)." |