Pulls in several portability fixes, including the fact that gnulib now only works on platforms with two's complement signed integers. Also makes for a smaller delta on the next update (we are waiting on a license change to unsetenv for the sake of mingw). * .gnulib: Update to latest. * bootstrap: Resync from upstream. * tests/virstringtest.c: Drop use of obsolete probes of integer properties. Signed-off-by: Eric Blake <eblake@redhat.com> --- I'd like to get this in now, before RC1 is cut, so that we maximize the testing of the bulk of the gnulib changes (rather than waiting for the unsetenv change needed for mingw to land, but forcing the gnulib update to only get testing in RC2). * .gnulib 6cc32c6...8d807a9 (127):

gendocs.sh: Set default TOP_NODE_UP_URL in HTML output. manywarnings: update for GCC 6.1 autoupdate intdiv0, memmem, nocrash, strcasestr, strstr: no exit glob: size_t overflow checks glob: don't assume INT_MAX < SIZE_MAX Fix undefined behaviour in gettext.h. autoupdate git-version-gen: avoid undefined shift update from texinfo glob: merge glibc changes into lib/glob.c mktime: spelling fix in comment mktime: port to stricter signed overflow checking mktime: speed up DEBUG_MKTIME benchmarks mktime: resurrect DEBUG_MKTIME testing mktime: simplify DEBUG_MKTIME Port mktime_internal offset to unsigned time_t xstrtol: prohibit monstrosities like "1bB" xstrtod: reinstate setting of *result upon ERANGE xstrtod: modify *result only if no errors btowc: document problems in C locale autoupdate update from texinfo mktime: improve integer overflow checking intprops: check two's complement assumption intprops, mktime, strtol: assume two's complement stdint: port to strict C11 left shift mbrtowc: work around glibc bug#19932 update from texinfo autoupdate stdint: detect good enough pre-C++11 stdint.h in C++ mode argp: merge changes from glibc Prefer American spelling for "initialize" autoupdate stddef: support configuring with g++ autoupdate autoupdate update from texinfo test-framework-sh: minor cleanups test-framework-sh: revert port to NetBSD 7.0 autoupdate Port better to Alpine Linux test-framework-sh: port to NetBSD 7.0 update from texinfo gitlog-to-changelog: suppress ignored chatter update from texinfo update from texinfo setlocale: add "sv" to Windows language table update from texinfo sys_select: port to new Cygwin test-userspec.c: do not trigger gcc's new -Wmisleading-indentation time_rz: port to clang -Wunused-const-variable std-gnu11: improve clang support select: port more to Intel 2016.1.150 compiler select: try to port to 2016.1.150 compiler localename-tests: memory allocation fixes intprops: make .h file license match module acl: fix missing return on Cygwin update from texinfo update from texinfo extern-inline: port to PGI CC update from texinfo update from texinfo signbit: port back to pre-C++11 GCC mountlist: recognize autofs-mounted remote file systems, too signbit: port to C++ with GCC 6 regex: make it closer to libc regex: merge patches from libc update from texinfo update from texinfo autoupdate autoupdate stdalign: port to older HP and IBM cc stdalign: port to clang 3.7.0 update from texinfo readdir_r: now obsolescent Use modern texinfo when syncing install.texi output from autoconf update from texinfo sync install.texi from autoconf misc: port better to gcc -fsanitize=address update from texinfo autoupdate verify-tests: also remove stray test-verify.Tpo std-gnu11: new module update from texinfo update from texinfo get-permissions, strftime: fix grammar in comments gettext: mark as obsolete gnulib-tool: don't give up on ln -s so easily closedir: fix OS/2-related typos openat_proc_name: fix that last '/' is overwritten on OS/2 kLIBC regex: treat [x] as x if x is a unibyte encoding error closedir, dirfd, opendir: port to OpenSolaris 5.10 bootstrap: use American spelling @item needed inside @itemize hash-pjw-bare: fix comment wcwidth: Replace also on OpenBSD 5.8 update from texinfo gnu-web-doc-update: fix addition of new files utimens-tests: avoid pulling gettext .m4 files regex: pacify static checkers regex: fix [ diagnostic regex: fix memory leaks fts: don't unconditionally use leaf optimization for NFS * gnulib-tool: fix stray debug line in previous patch gnulib-tool: don't assume ln -s works utimes: detect utimes() correctly on OS/2 kLIBC openat_proc_name: port to OS/2 kLIBC stdint: check _INTPTR_T_DECLARED for intptr_t etc. doc: mention unfixed issues with unsupported localtime() values Go back to gettext-0.19.7 opendir, closedir, dirfd, fdopendir: port to OS/2 kLIBC dup, dup2, fcntl: support a directory fd on OS/2 kLIBC pipe_filter_ii_execute: port to OS/2 kLIBC wchar: fix "conflicting types" error for __wcwidth on OS/2 kLIBC w32spawn: clear SHELL_SPECIAL_CHARS and SHELL_SPACE_CHAR on OS/2 kLIBC pipe-filter-aux: undefine HAVE_SELECT on KLIBC binary-io: don't put fd in binary mode if it is a console on EMX doc: mention setlocale() issues on OpenBSD sig2str: list all signals on FreeBSD >= 7 acl-permissions: port to USE_ACL==0 platforms mktime: rename macro to avoid glibc clash Port "$@" to OpenIndiana ksh93 autoupdate Port Universal Time settings to strict POSIX update from texinfo update from texinfo

.gnulib | 2 +- bootstrap | 6 +++--- tests/virstringtest.c | 9 +++------ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.gnulib b/.gnulib index 6cc32c6..8d807a9 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 6cc32c63e80bc1a30c521b2f07f2b54909b59892 +Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8 diff --git a/bootstrap b/bootstrap index 294c0bc..f060bab 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2014-12-08.12; # UTC +scriptversion=2016-01-24.06; # UTC # Bootstrap this package from checked-out sources. @@ -42,7 +42,7 @@ export LC_ALL local_gl_dir=gl -# Honour $PERL, but work even if there is none +# Honor $PERL, but work even if there is none. PERL="${PERL-perl}" me=$0 @@ -1021,6 +1021,6 @@ echo "$0: done. Now you can run './configure'." # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/tests/virstringtest.c b/tests/virstringtest.c index 7a1dcfd..63b8009 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Red Hat, Inc. + * Copyright (C) 2012-2016 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,6 @@ #include <stdlib.h> #include "testutils.h" -#include "intprops.h" #include "verify.h" #include "virerror.h" #include "viralloc.h" @@ -409,13 +408,11 @@ struct stringToLongData { /* This test makes assumptions about our compilation platform that are * not guaranteed by POSIX. Good luck to you if you are crazy enough - * to try and port libvirt to a platform with 16-bit int. */ + * to try and port libvirt to a platform with 16-bit int. Gnulib + * already assumes that signed integers are two's complement. */ verify(sizeof(int) == 4); -verify(TYPE_TWOS_COMPLEMENT(int)); verify(sizeof(long) == sizeof(int) || sizeof(long) == sizeof(long long)); -verify(TYPE_TWOS_COMPLEMENT(long)); verify(sizeof(long long) == 8); -verify(TYPE_TWOS_COMPLEMENT(long long)); static int testStringToLong(const void *opaque) -- 2.5.5