From 2654c71a46bdfc148b649802b2edbacbd8e03e25 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 9 Mar 2013 17:55:39 +0000 Subject: Fix epunt_cxx not to subshell. --- eclass/ChangeLog | 5 ++++- 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 eutils.eclass: + Fix epunt_cxx not to subshell. 09 Mar 2013; Michał Górny 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)." -- cgit v1.2.3-65-gdbad