From 7db886e71cc61403ef57e9788ea6602bb1ff3bef Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 3 Jan 2019 07:42:41 -0600 Subject: [PATCH] maint: update gnulib for syntax-check on BSD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In particular, this incorporates Roman's patches to allow 'make syntax-check' to work on BSD with its exec argv limitations that previously failed when trying to grep the large number of files present in libvirt. cfg.mk needs similar changes, but that will be tackled separately. Signed-off-by: Eric Blake Reviewed-by: Ján Tomko --- .gnulib | 2 +- bootstrap | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 4652c7bafa..8089c00979 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 4652c7bafa60332145f1e05a7de5f48e1bc56226 +Subproject commit 8089c00979a5b089cff592c6b91420e595657167 diff --git a/bootstrap b/bootstrap index c13b486c57..5b08e7e2d4 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2018-10-13.05; # UTC +scriptversion=2019-01-04.17; # UTC # Bootstrap this package from checked-out sources. @@ -963,6 +963,16 @@ fi bootstrap_post_import_hook \ || die "bootstrap_post_import_hook failed" +# Don't proceed if there are uninitialized submodules. In particular, +# the next step will remove dangling links, which might be links into +# uninitialized submodules. +# +# Uninitialized submodules are listed with an initial dash. +if $use_git && git submodule | grep '^-' >/dev/null; then + die "some git submodules are not initialized. " \ + "Run 'git submodule init' and bootstrap again." +fi + # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some # gnulib-populated directories. Such .m4 files would cause aclocal to fail. # The following requires GNU find 4.2.3 or newer. Considering the usual