[patch] Patch delaying subdir eautoreconf

autotools.eclass.diff (text/plain), 2.51 KB, created by Michał Górny on 2014-12-31 11:20:32 UTC

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.170
diff -u -B -r1.170 autotools.eclass
--- autotools.eclass	21 Nov 2014 09:17:07 -0000	1.170
+++ autotools.eclass	31 Dec 2014 11:19:22 -0000
@@ -165,25 +165,6 @@
 eautoreconf() {
 	local x g
 
-	# Subdirs often share a common build dir #529404.  If so, we can't safely
-	# run in parallel because many tools clobber the content in there.  Libtool
-	# and automake both `rm && cp` while aclocal reads the output.  We might be
-	# able to handle this if we split the steps and grab locks on the dirs the
-	# tools actually write to.  Then we'd run all the common tools that use
-	# those inputs.  Doing this in bash does not scale easily.
-	# If we do re-enable parallel support, make sure #426512 is handled.
-	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
-				# Avoid unsafe nested multijob_finish_one for bug #426512.
-				AT_NOELIBTOOLIZE="yes" eautoreconf || die
-				popd >/dev/null
-			fi
-		done
-	fi
-
 	einfo "Running eautoreconf in '${PWD}' ..."
 
 	local m4dirs=$(autotools_check_macro_val AC_CONFIG_{AUX,MACRO}_DIR)
@@ -207,6 +188,25 @@
 		fi
 	done
 
+	# Subdirs often share a common build dir #529404.  If so, we can't safely
+	# run in parallel because many tools clobber the content in there.  Libtool
+	# and automake both `rm && cp` while aclocal reads the output.  We might be
+	# able to handle this if we split the steps and grab locks on the dirs the
+	# tools actually write to.  Then we'd run all the common tools that use
+	# those inputs.  Doing this in bash does not scale easily.
+	# If we do re-enable parallel support, make sure #426512 is handled.
+	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
+				# Avoid unsafe nested multijob_finish_one for bug #426512.
+				AT_NOELIBTOOLIZE="yes" eautoreconf || die
+				popd >/dev/null
+			fi
+		done
+	fi
+
 	# Generate aclocal.m4 with our up-to-date m4 files.
 	local rerun_aclocal=false
 	eaclocal
@@ -516,7 +517,7 @@
 ALL_AUTOTOOLS_MACROS=(
 	A{C,M}_PROG_LIBTOOL LT_INIT
 	A{C,M}_CONFIG_HEADER{S,}
-	AC_CONFIG_SUBDIRS
+	AC_CONFIG_SUBDIRS LT_CONFIG_LTDL_DIR
 	AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR
 	AM_INIT_AUTOMAKE
 	AM_GLIB_GNU_GETTEXT