|
Lines 165-189
Link Here
|
| 165 |
eautoreconf() { |
165 |
eautoreconf() { |
| 166 |
local x g |
166 |
local x g |
| 167 |
|
167 |
|
| 168 |
# Subdirs often share a common build dir #529404. If so, we can't safely |
|
|
| 169 |
# run in parallel because many tools clobber the content in there. Libtool |
| 170 |
# and automake both `rm && cp` while aclocal reads the output. We might be |
| 171 |
# able to handle this if we split the steps and grab locks on the dirs the |
| 172 |
# tools actually write to. Then we'd run all the common tools that use |
| 173 |
# those inputs. Doing this in bash does not scale easily. |
| 174 |
# If we do re-enable parallel support, make sure #426512 is handled. |
| 175 |
if [[ -z ${AT_NO_RECURSIVE} ]] ; then |
| 176 |
# Take care of subdirs |
| 177 |
for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do |
| 178 |
if [[ -d ${x} ]] ; then |
| 179 |
pushd "${x}" >/dev/null |
| 180 |
# Avoid unsafe nested multijob_finish_one for bug #426512. |
| 181 |
AT_NOELIBTOOLIZE="yes" eautoreconf || die |
| 182 |
popd >/dev/null |
| 183 |
fi |
| 184 |
done |
| 185 |
fi |
| 186 |
|
| 187 |
einfo "Running eautoreconf in '${PWD}' ..." |
168 |
einfo "Running eautoreconf in '${PWD}' ..." |
| 188 |
|
169 |
|
| 189 |
local m4dirs=$(autotools_check_macro_val AC_CONFIG_{AUX,MACRO}_DIR) |
170 |
local m4dirs=$(autotools_check_macro_val AC_CONFIG_{AUX,MACRO}_DIR) |
|
Lines 207-212
Link Here
|
| 207 |
fi |
188 |
fi |
| 208 |
done |
189 |
done |
| 209 |
|
190 |
|
|
|
191 |
# Subdirs often share a common build dir #529404. If so, we can't safely |
| 192 |
# run in parallel because many tools clobber the content in there. Libtool |
| 193 |
# and automake both `rm && cp` while aclocal reads the output. We might be |
| 194 |
# able to handle this if we split the steps and grab locks on the dirs the |
| 195 |
# tools actually write to. Then we'd run all the common tools that use |
| 196 |
# those inputs. Doing this in bash does not scale easily. |
| 197 |
# If we do re-enable parallel support, make sure #426512 is handled. |
| 198 |
if [[ -z ${AT_NO_RECURSIVE} ]] ; then |
| 199 |
# Take care of subdirs |
| 200 |
for x in $(autotools_check_macro_val AC_CONFIG_SUBDIRS) ; do |
| 201 |
if [[ -d ${x} ]] ; then |
| 202 |
pushd "${x}" >/dev/null |
| 203 |
# Avoid unsafe nested multijob_finish_one for bug #426512. |
| 204 |
AT_NOELIBTOOLIZE="yes" eautoreconf || die |
| 205 |
popd >/dev/null |
| 206 |
fi |
| 207 |
done |
| 208 |
fi |
| 209 |
|
| 210 |
# Generate aclocal.m4 with our up-to-date m4 files. |
210 |
# Generate aclocal.m4 with our up-to-date m4 files. |
| 211 |
local rerun_aclocal=false |
211 |
local rerun_aclocal=false |
| 212 |
eaclocal |
212 |
eaclocal |
|
Lines 516-522
Link Here
|
| 516 |
ALL_AUTOTOOLS_MACROS=( |
517 |
ALL_AUTOTOOLS_MACROS=( |
| 517 |
A{C,M}_PROG_LIBTOOL LT_INIT |
518 |
A{C,M}_PROG_LIBTOOL LT_INIT |
| 518 |
A{C,M}_CONFIG_HEADER{S,} |
519 |
A{C,M}_CONFIG_HEADER{S,} |
| 519 |
AC_CONFIG_SUBDIRS |
520 |
AC_CONFIG_SUBDIRS LT_CONFIG_LTDL_DIR |
| 520 |
AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR |
521 |
AC_CONFIG_AUX_DIR AC_CONFIG_MACRO_DIR |
| 521 |
AM_INIT_AUTOMAKE |
522 |
AM_INIT_AUTOMAKE |
| 522 |
AM_GLIB_GNU_GETTEXT |
523 |
AM_GLIB_GNU_GETTEXT |
