diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-01-05 02:27:16 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-01-05 02:27:16 +0000 |
| commit | e7c181027c27304e262d8cd912237434767997f3 (patch) | |
| tree | 626087bb4e4527d63907618ea9d6914b0c937d7a /eclass/autotools.eclass | |
| parent | Fix installsources spelling in comment. (diff) | |
| download | gentoo-2-e7c181027c27304e262d8cd912237434767997f3.tar.gz gentoo-2-e7c181027c27304e262d8cd912237434767997f3.tar.bz2 gentoo-2-e7c181027c27304e262d8cd912237434767997f3.zip | |
Avoid unsafe nested multijob_finish_one in eautoreconf for bug #426512.
Diffstat (limited to 'eclass/autotools.eclass')
| -rw-r--r-- | eclass/autotools.eclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 52029d137cf7..2b92cfb2b2cd 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.149 2012/09/20 18:04:59 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.150 2013/01/05 02:27:16 zmedico Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -157,7 +157,13 @@ eautoreconf() { for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do if [[ -d ${x} ]] ; then pushd "${x}" >/dev/null - AT_NOELIBTOOLIZE="yes" multijob_child_init eautoreconf || die + if [[ -z ${PAST_TOPLEVEL_EAUTORECONF} ]] ; then + PAST_TOPLEVEL_EAUTORECONF="yes" AT_NOELIBTOOLIZE="yes" \ + multijob_child_init eautoreconf || die + else + # Avoid unsafe nested multijob_finish_one for bug #426512. + AT_NOELIBTOOLIZE="yes" eautoreconf || die + fi popd >/dev/null fi done |