From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1ScVle-0005mm-EL for garchives@archives.gentoo.org; Thu, 07 Jun 2012 06:00:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D550FE0653; Thu, 7 Jun 2012 06:00:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A8E03E0653 for ; Thu, 7 Jun 2012 06:00:14 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3EC21B4035 for ; Thu, 7 Jun 2012 06:00:06 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 55D462004B; Thu, 7 Jun 2012 06:00:05 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: autotools.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120607060005.55D462004B@flycatcher.gentoo.org> Date: Thu, 7 Jun 2012 06:00:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ded31f27-e886-4dfd-a1d9-8f1e5eee789a X-Archives-Hash: 9a5848404c461bc016b88fc3e578b9e1 vapier 12/06/07 06:00:05 Modified: autotools.eclass Log: run autotools in subdirs in parallel with new multiprocessing eclass Revision Changes Path 1.146 eclass/autotools.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?rev=3D1.146&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?rev=3D1.146&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?r1=3D1.145&r2=3D1.146 Index: autotools.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- autotools.eclass 7 Jun 2012 04:50:04 -0000 1.145 +++ autotools.eclass 7 Jun 2012 06:00:05 -0000 1.146 @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.145 2012/= 06/07 04:50:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.146 2012/= 06/07 06:00:05 vapier Exp $ =20 # @ECLASS: autotools.eclass # @MAINTAINER: @@ -16,7 +16,7 @@ if [[ ${___ECLASS_ONCE_AUTOTOOLS} !=3D "recur -_+^+_- spank" ]] ; then ___ECLASS_ONCE_AUTOTOOLS=3D"recur -_+^+_- spank" =20 -inherit libtool +inherit libtool multiprocessing =20 # @ECLASS-VARIABLE: WANT_AUTOCONF # @DESCRIPTION: @@ -144,14 +144,20 @@ # Should do a full autoreconf - normally what most people will be intere= sted in. # Also should handle additional directories specified by AC_CONFIG_SUBDI= RS. eautoreconf() { - local x g + local x g multitop =20 - if [[ -z ${AT_NO_RECURSIVE} ]]; then + if [[ -z ${AT_TOPLEVEL_EAUTORECONF} ]] ; then + AT_TOPLEVEL_EAUTORECONF=3D"yes" + multitop=3D"yes" + multijob_init + fi + + if [[ -z ${AT_NO_RECURSIVE} ]] ; then # Take care of subdirs for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do if [[ -d ${x} ]] ; then pushd "${x}" >/dev/null - AT_NOELIBTOOLIZE=3D"yes" eautoreconf + AT_NOELIBTOOLIZE=3D"yes" multijob_child_init eautoreconf || die popd >/dev/null fi done @@ -199,11 +205,16 @@ eautoheader [[ ${AT_NOEAUTOMAKE} !=3D "yes" ]] && FROM_EAUTORECONF=3D"yes" eautomak= e ${AM_OPTS} =20 - [[ ${AT_NOELIBTOOLIZE} =3D=3D "yes" ]] && return 0 + if [[ ${AT_NOELIBTOOLIZE} !=3D "yes" ]] ; then + # Call it here to prevent failures due to elibtoolize called _before_ + # eautoreconf. We set $S because elibtoolize runs on that #265319 + S=3D${PWD} elibtoolize --force + fi =20 - # Call it here to prevent failures due to elibtoolize called _before_ - # eautoreconf. We set $S because elibtoolize runs on that #265319 - S=3D${PWD} elibtoolize --force + if [[ -n ${multitop} ]] ; then + unset AT_TOPLEVEL_EAUTORECONF + multijob_finish || die + fi =20 return 0 }