diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2013-03-12 14:16:16 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2013-03-12 14:16:16 +0000 |
| commit | 77cfc64c111430ae8ffd9d2bddb5fa6e36a7c50e (patch) | |
| tree | d1d6c8c1e1dedf14aaa4a590530dc3e9869e5d33 /eclass/eutils.eclass | |
| parent | sci-calculators/gonvert: Version Bump; fix for new python eclasses (diff) | |
| download | historical-77cfc64c111430ae8ffd9d2bddb5fa6e36a7c50e.tar.gz historical-77cfc64c111430ae8ffd9d2bddb5fa6e36a7c50e.tar.bz2 historical-77cfc64c111430ae8ffd9d2bddb5fa6e36a7c50e.zip | |
epunt_cxx: support different versions of autotools since 2.64 changed the signature #460992 by Michał Górny
Diffstat (limited to 'eclass/eutils.eclass')
| -rw-r--r-- | eclass/eutils.eclass | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index c3d988c6d433..493e59cc85d4 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.414 2013/03/11 00:13:16 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.415 2013/03/12 14:16:15 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -1269,16 +1269,19 @@ epunt_cxx() { local dir=$1 [[ -z ${dir} ]] && dir=${S} ebegin "Removing useless C++ checks" - local f any_found + local f p any_found 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 + for p in "${PORTDIR}"/eclass/ELT-patches/nocxx/*.patch ; do + if patch --no-backup-if-mismatch -p1 "${f}" "${p}" >/dev/null ; then + any_found=1 + break + fi + done done < <(find "${dir}" -name configure -print0) -# if [[ -z ${any_found} ]]; then -# eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)." -# fi + if [[ -z ${any_found} ]]; then + eqawarn "epunt_cxx called unnecessarily (no C++ checks to punt)." + fi eend 0 } |