In particular, pull in gnulib's fix for the broken SIZE_MAX on s390.
* .gnulib: Update to latest.
* bootstrap: Resync to upstream.
Signed-off-by: Eric Blake <eblake@xxxxxxxxxx>
---
A buildbot on an s390 platform was complaining:
CC util/libvirt_setuid_rpc_client_la-virconf.lo
util/virconf.c: In function 'virConfGetValueSizeT':
util/virconf.c:1220:9: error: format '%zu' expects argument of type 'size_t', but argument 9 has type 'unsigned int' [-Werror=format=]
virReportError(VIR_ERR_INTERNAL_ERROR,
^
This gnulib update should fix it; since we're between releases,
I'm pushing this under the gnulib maintenance rule.
* .gnulib e89b4a7...5ddd9d7 (73):
> strerror_r-posix: Fix override of AC_FUNC_STRERROR_R
> Fix gnulib C++ namespace support and std::frexp
> GNULIB_NAMESPACE::func need not pull in rpl_func
> manywarnings: fix -Wno-missing-field-initializers detection
> non-recursive-gnulib-prefix-hack: revert use of parameterized 'lib' dir
> strftime,strptime: support %q to represent the quarter
> autoupdate
> bootstrap: Fix get_version() for AIX 5.3
> intprops: port to older XL C
> autoupdate
> backupfile: initialize default suffix within the implementation
> futimens: remove FIXME for old Linux kernels
> utimensat: remove FIXME for old Linux kernels
> maint: update how to make web pages
> qsort_r: Fix macrology for platforms that lack the function.
> sys_types: fix Texinfo typos
> getprogname: port to HP-UX
> Update doc about target platforms.
> opendir, readdir, closedir: Relicense under LGPLv2+.
> Fix conflict between strerror_r-posix module and AC_FUNC_STRERROR_R.
> Make the 'argp' module work without the 'error' module.
> diffseq: restore TOO_EXPENSIVE heuristic
> non-recursive-gnulib-prefix-hack: Don't make assumptions about gnulib-tool's --source-base option value.
> iconv: Avoid compilation error when bootstrapping GNU libiconv.
> Avoid gnulib-tool warnings about the dependencies of 'parse-datetime'.
> system-quote tests: Avoid compiler warning on AIX.
> Fix some "gcc -Wall" warnings.
> gnulib-tool: Make --create-testdir on all modules work again.
> libunistring: change the maintainer to 'all'
> Simplify "configure: checking ..." messages.
> Simplify "configure: checking ..." messages.
> quotearg-tests: pacify gcc -Wall
> canonicalize-lgpl: fix for missing SIZE_MAX on older systems
> printf.m4: fix a bug in detecting printf %j support
> sched: substitute HAVE_SYS_CDEFS_H too
> quotearg: never write beyond the returned length
> getprogname tests: Avoid failure in packages that use libtool.
> getprogname: Fix test failure on Cygwin. Comments.
> Make sure the libunistring detection rejects older versions with a known bug.
> sh-quote, system-quote: revert regression of unit test.
> quotearg: fix stale tests
> non-recursive-gnulib-prefix-hack: fix inconsequential typo
> Fix a test crash.
> test-limits-h: suppress -Woverlength-strings
> gettime, timespec, utimens: Relicense under LGPL.
> canonicalize-lgpl: Support the case path_max > INT_MAX.
> getprogname: IBM z/OS: avoid NULL-dereference
> test-stdint: use _GL_VERIFY rather than "verify" for some tests
> Add missing ChangeLog entry
> stdint: port SIZE_MAX to glibc s390
> getprogname: port to IBM z/OS
> maint: remove stray space after "." in AC_DEFINE comment.
> long-options: avoid new GCC 7 warning from -Wimplicit-fallthrough
> utimecmp: avoid new GCC 7 warning from -Wbool-operation
> dfa: save memory for states
> wchar, wctype-h: fix for MinGW 3.22.2
> long-options: avoid new GCC 7 warning from -Wimplicit-fallthrough
> utimecmp: avoid new GCC 7 warning from -Wbool-operation
> autoupdate
> quotearg: minimize shell quoting using double quotes
> vasnprintf.c: avoid spurious warning from GCC 7
> getprogname: correct the test for a __progname variable
> u8-uctomb-aux.c: build: placate GCC 7's new -Wimplicit-fallthrough
> dfa: build: avoid warning from GCC 7's new -Wimplicit-fallthrough
> getprogname: avoid __progname vs program_invocation_short_name pitfall
> getprogname: port to OpenBSD 5.1
> sched: port to GCC 6.2.1 on macOS Sierra
> tests/init.sh: port Alpine fix to AIX 7.1
> nl_langinfo: pacify GCC
> stdint: also set GL_GENERATE_LIMITS_H
> limits-h, stdint: Don't assume extensions, fix typo
> getprogname: port to AIX
> update from texinfo
.gnulib | 2 +-
bootstrap | 38 ++++++++++++++++++++------------------
2 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/.gnulib b/.gnulib
index e89b4a7..5ddd9d7 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit e89b4a7aefce9cb02963920712ba7cdd13641644
+Subproject commit 5ddd9d713d58d6c6d10494a28ceee6988d20ff98
diff --git a/bootstrap b/bootstrap
index f060bab..5d3c289 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2016-01-24.06; # UTC
+scriptversion=2016-11-03.18; # UTC
# Bootstrap this package from checked-out sources.
@@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available
done
}
+get_version_sed='
+# Move version to start of line.
+s/.*[v ]\([0-9]\)/\1/
+
+# Skip lines that do not start with version.
+/^[0-9]/!d
+
+# Remove characters after the version.
+s/[^.a-z0-9-].*//
+
+# The first component must be digits only.
+s/^\([0-9]*\)[a-z-].*/\1/
+
+#the following essentially does s/5.005/5.5/
+s/\.0*\([1-9]\)/.\1/g
+p
+q'
+
get_version() {
app=$1
$app --version >/dev/null 2>&1 || { $app --version; return 1; }
- $app --version 2>&1 |
- sed -n '# Move version to start of line.
- s/.*[v ]\([0-9]\)/\1/
-
- # Skip lines that do not start with version.
- /^[0-9]/!d
-
- # Remove characters after the version.
- s/[^.a-z0-9-].*//
-
- # The first component must be digits only.
- s/^\([0-9]*\)[a-z-].*/\1/
-
- #the following essentially does s/5.005/5.5/
- s/\.0*\([1-9]\)/.\1/g
- p
- q'
+ $app --version 2>&1 | sed -n "$get_version_sed"
}
check_versions() {
--
2.7.4
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list