[libvirt] [PATCH 0/2] gnulib update
I'll probably push this in another 24 hours if I don't get a review (I'm not pushing it now, because I want to test it on a few more machines first...). Eric Blake (2): maint: avoid bootstrap warning maint: update gnulib submodule .gnulib | 2 +- bootstrap | 35 +++++++++++++++++------------------ bootstrap.conf | 6 ++---- 3 files changed, 20 insertions(+), 23 deletions(-) -- 1.8.3.1
I noticed that in a fresh checkout, autogen.sh included the following: 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 but 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 were having to rerun automake because we picked the wrong hook name, and the warning was from the first run where the problem got fixed before our manual second run. The problem was introduced in commit 70363ea. * bootstrap.conf (bootstrap_epilogue): Rename... (bootstrap_post_import_hook): ...so that it gets run before automake. Signed-off-by: Eric Blake <eblake@redhat.com> --- bootstrap.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index a1d1f07..68c4a89 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -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 } -- 1.8.3.1
Gnulib recently patched gcc warning detection so that it does not treat things like -Wno-unused-command-line-argument as supported in gcc (treating it as supported merely resulted in extra verbosity when an actual compile error occurred). It has also improved bootstrap to work with less hassle on OpenBSD. * .gnulib: Update to latest, in part for bootstrap and warnings improvements. * bootstrap: Resync from gnulib. Signed-off-by: Eric Blake <eblake@redhat.com> --- * .gnulib 644c404...0def69a (17):
xvasprintf-tests: port to GCC with hardening flags fpending: port to recent Cygwin change to stdio_ext.h no need for tendentious comment regenerate autoupdate sys_time: port to OpenBSD autoupdate bootstrap: support checksum utils without a --status option update from texinfo Fix ChangeLog typo. autoupdate regex: port to non-glibc/lock-using systems update from texinfo autoupdate localecharset: make locale_charset thread-safe on Mac OS X gettext: update to version 0.18.3 autoupdate
.gnulib | 2 +- bootstrap | 35 +++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.gnulib b/.gnulib index 644c404..0def69a 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 644c40496cf7d5a705a73c9dd32b035fcecc2ab1 +Subproject commit 0def69a36c490005f847189f22f68f903b3f258f diff --git a/bootstrap b/bootstrap index a37fb8a..df763de 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2013-07-03.20; # UTC +scriptversion=2013-08-09.15; # UTC # Bootstrap this package from checked-out sources. @@ -224,27 +224,21 @@ find_tool () find_tool_names=$@ eval "find_tool_res=\$$find_tool_envvar" if test x"$find_tool_res" = x; then - for i - do + for i; do if ($i --version </dev/null) >/dev/null 2>&1; then - find_tool_res=$i - break + find_tool_res=$i + break fi done - else - find_tool_error_prefix="\$$find_tool_envvar: " fi - test x"$find_tool_res" != x \ - || die "one of these is required: $find_tool_names" - ($find_tool_res --version </dev/null) >/dev/null 2>&1 \ - || die "${find_tool_error_prefix}cannot run $find_tool_res --version" + if test x"$find_tool_res" = x; then + warn_ "one of these is required: $find_tool_names;" + die "alternatively set $find_tool_envvar to a compatible tool" + fi eval "$find_tool_envvar=\$find_tool_res" eval "export $find_tool_envvar" } -# Find sha1sum, named gsha1sum on MacPorts, and shasum on Mac OS X 10.6. -find_tool SHA1SUM sha1sum gsha1sum shasum - # Override the default configuration, if necessary. # Make sure that bootstrap.conf is sourced from the current directory # if we were invoked as "sh bootstrap". @@ -469,7 +463,7 @@ check_versions() { if [ "$req_ver" = "-" ]; then # Merely require app to exist; not all prereq apps are well-behaved # so we have to rely on $? rather than get_version. - $app --version >/dev/null 2>&1 + $app --version >/dev/null 2>&1 </dev/null if [ 126 -le $? ]; then warn_ "Error: '$app' not found" ret=1 @@ -503,6 +497,12 @@ print_versions() { # can't depend on column -t } +# Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6. +# Also find the compatible sha1 utility on the BSDs +if test x"$SKIP_PO" = x; then + find_tool SHA1SUM sha1sum gsha1sum shasum sha1 +fi + use_libtool=0 # We'd like to use grep -E, to see if any of LT_INIT, # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac, @@ -692,11 +692,10 @@ update_po_files() { cksum_file="$ref_po_dir/$po.s1" if ! test -f "$cksum_file" || ! test -f "$po_dir/$po.po" || - ! $SHA1SUM -c --status "$cksum_file" \ - < "$new_po" > /dev/null; then + ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then echo "$me: updated $po_dir/$po.po..." cp "$new_po" "$po_dir/$po.po" \ - && $SHA1SUM < "$new_po" > "$cksum_file" + && $SHA1SUM < "$new_po" > "$cksum_file" || return fi done } -- 1.8.3.1
On 08/14/2013 05:44 PM, Eric Blake wrote:
I'll probably push this in another 24 hours if I don't get a review (I'm not pushing it now, because I want to test it on a few more machines first...).
My testing passed on RHEL 5, RHEL 6, Fedora 19, and FreeBSD, which covers a pretty wide range of autoconf versions. Pushing under the gnulib maintenance rule.
Eric Blake (2): maint: avoid bootstrap warning maint: update gnulib submodule
.gnulib | 2 +- bootstrap | 35 +++++++++++++++++------------------ bootstrap.conf | 6 ++---- 3 files changed, 20 insertions(+), 23 deletions(-)
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (1)
-
Eric Blake