mirror of https://gitee.com/openkylin/libvirt.git
maint: avoid bootstrap warning
I noticed that in a fresh checkout, autogen.sh generated the following output, but continued on with execution: autoreconf: running: automake --add-missing --copy --force-missing gnulib/tests/Makefile.am:28: TESTS was already defined in condition TRUE, which includes condition WITH_EXPENSIVE_TESTS ... gnulib/tests/gnulib.mk:28: ... `TESTS' previously defined here gnulib/tests/Makefile.am:19: `gnulib/tests/gnulib.mk' included from here and after the run, line 28 of gnulib.mk lists GNULIB_TESTS, not TESTS. After more investigation, I found that it is because gnulib bootstrap provides two hooks, one before automake, and the other after; we used the one that ran after, and were then rerunning automake ourselves; and the warning was from the first run. But a manual second run is pointless if we use the right hook in the first place. The wrong function name has been latent since commit38c9440
, and we tried to work around it in commit6cbab7c
, but it took commit70363ea
to finally change output enough for me to realize the root cause. * bootstrap.conf (bootstrap_epilogue): Rename... (bootstrap_post_import_hook): ...so that it gets run before automake. Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
c53b9c3e9f
commit
14b4b1e2cb
|
@ -241,13 +241,11 @@ gnulib_extra_files="
|
|||
"
|
||||
|
||||
|
||||
bootstrap_epilogue()
|
||||
bootstrap_post_import_hook()
|
||||
{
|
||||
# Change paths in gnulib/tests/gnulib.mk from "../../.." to "../..",
|
||||
# and make tests conditional by changing "TESTS" to "GNULIB_TESTS",
|
||||
# then ensure that gnulib/tests/Makefile.in is up-to-date.
|
||||
# and make tests conditional by changing "TESTS" to "GNULIB_TESTS".
|
||||
m=gnulib/tests/gnulib.mk
|
||||
sed 's,\.\./\.\./\.\.,../..,g; s/^TESTS /GNULIB_TESTS /' $m > $m-t
|
||||
mv -f $m-t $m
|
||||
${AUTOMAKE-automake} gnulib/tests/Makefile
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue