| 1 |
vapier 12/06/07 06:00:05 |
| 2 |
|
| 3 |
Modified: autotools.eclass |
| 4 |
Log: |
| 5 |
run autotools in subdirs in parallel with new multiprocessing eclass |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.146 eclass/autotools.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.146&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.146&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.145&r2=1.146 |
| 13 |
|
| 14 |
Index: autotools.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
| 17 |
retrieving revision 1.145 |
| 18 |
retrieving revision 1.146 |
| 19 |
diff -u -r1.145 -r1.146 |
| 20 |
--- autotools.eclass 7 Jun 2012 04:50:04 -0000 1.145 |
| 21 |
+++ autotools.eclass 7 Jun 2012 06:00:05 -0000 1.146 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.145 2012/06/07 04:50:04 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.146 2012/06/07 06:00:05 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: autotools.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -16,7 +16,7 @@ |
| 31 |
if [[ ${___ECLASS_ONCE_AUTOTOOLS} != "recur -_+^+_- spank" ]] ; then |
| 32 |
___ECLASS_ONCE_AUTOTOOLS="recur -_+^+_- spank" |
| 33 |
|
| 34 |
-inherit libtool |
| 35 |
+inherit libtool multiprocessing |
| 36 |
|
| 37 |
# @ECLASS-VARIABLE: WANT_AUTOCONF |
| 38 |
# @DESCRIPTION: |
| 39 |
@@ -144,14 +144,20 @@ |
| 40 |
# Should do a full autoreconf - normally what most people will be interested in. |
| 41 |
# Also should handle additional directories specified by AC_CONFIG_SUBDIRS. |
| 42 |
eautoreconf() { |
| 43 |
- local x g |
| 44 |
+ local x g multitop |
| 45 |
|
| 46 |
- if [[ -z ${AT_NO_RECURSIVE} ]]; then |
| 47 |
+ if [[ -z ${AT_TOPLEVEL_EAUTORECONF} ]] ; then |
| 48 |
+ AT_TOPLEVEL_EAUTORECONF="yes" |
| 49 |
+ multitop="yes" |
| 50 |
+ multijob_init |
| 51 |
+ fi |
| 52 |
+ |
| 53 |
+ if [[ -z ${AT_NO_RECURSIVE} ]] ; then |
| 54 |
# Take care of subdirs |
| 55 |
for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do |
| 56 |
if [[ -d ${x} ]] ; then |
| 57 |
pushd "${x}" >/dev/null |
| 58 |
- AT_NOELIBTOOLIZE="yes" eautoreconf |
| 59 |
+ AT_NOELIBTOOLIZE="yes" multijob_child_init eautoreconf || die |
| 60 |
popd >/dev/null |
| 61 |
fi |
| 62 |
done |
| 63 |
@@ -199,11 +205,16 @@ |
| 64 |
eautoheader |
| 65 |
[[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} |
| 66 |
|
| 67 |
- [[ ${AT_NOELIBTOOLIZE} == "yes" ]] && return 0 |
| 68 |
+ if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then |
| 69 |
+ # Call it here to prevent failures due to elibtoolize called _before_ |
| 70 |
+ # eautoreconf. We set $S because elibtoolize runs on that #265319 |
| 71 |
+ S=${PWD} elibtoolize --force |
| 72 |
+ fi |
| 73 |
|
| 74 |
- # Call it here to prevent failures due to elibtoolize called _before_ |
| 75 |
- # eautoreconf. We set $S because elibtoolize runs on that #265319 |
| 76 |
- S=${PWD} elibtoolize --force |
| 77 |
+ if [[ -n ${multitop} ]] ; then |
| 78 |
+ unset AT_TOPLEVEL_EAUTORECONF |
| 79 |
+ multijob_finish || die |
| 80 |
+ fi |
| 81 |
|
| 82 |
return 0 |
| 83 |
} |
Archives