[libvirt] [PATCH 2/2] maint: update gnulib submodule

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(a)redhat.com&gt; --- * .gnulib 644c404...0def69a (17): .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