From f14b8ae84df3165efc6818eb0189c148b18bf738 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 8 Nov 2025 10:50:10 -0800 Subject: [PATCH] build: update gnulib to latest; and update bootstrap --- bootstrap | 20 +++++++------------- gnulib | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/bootstrap b/bootstrap index 2d174ce..a15c4f5 100755 --- a/bootstrap +++ b/bootstrap @@ -3,7 +3,7 @@ # Bootstrap this package from checked-out sources. -scriptversion=2024-07-04.10; # UTC +scriptversion=2025-06-10.02; # UTC # Copyright (C) 2003-2025 Free Software Foundation, Inc. # @@ -37,7 +37,7 @@ medir=`dirname "$me"` # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2025-02-04.01; # UTC +scriptlibversion=2025-09-07.23; # UTC # Copyright (C) 2003-2025 Free Software Foundation, Inc. # @@ -72,7 +72,7 @@ export LC_ALL # Honor $PERL, but work even if there is none. PERL="${PERL-perl}" -default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git +default_gnulib_url=https://https.git.savannah.gnu.org/git/gnulib.git # Copyright year, for the --version output. copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'` @@ -580,17 +580,11 @@ prepare_GNULIB_SRCDIR () || cleanup_gnulib else # GNULIB_REFDIR is not set or not usable. Ignore it. - shallow= + shallow='--depth 2' if test -z "$GNULIB_REVISION"; then - if git clone -h 2>&1 | grep -- --depth > /dev/null; then - shallow='--depth 2' - fi git clone $shallow "$gnulib_url" "$gnulib_path" \ || cleanup_gnulib else - if git fetch -h 2>&1 | grep -- --depth > /dev/null; then - shallow='--depth 2' - fi # Only want a shallow checkout of $GNULIB_REVISION, but git does not # support cloning by commit hash. So attempt a shallow fetch by # commit hash to minimize the amount of data downloaded and changes @@ -1343,7 +1337,7 @@ autogen() # Invoke autoreconf with --force --install to ensure upgrades of tools # such as ylwrap. - AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" + AUTORECONFFLAGS="--verbose --install --force $ACLOCAL_FLAGS" AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive" # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. @@ -1419,7 +1413,7 @@ autogen() # Local Variables: # eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptlibversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: @@ -1630,7 +1624,7 @@ fi # Local Variables: # eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-format: "%Y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/gnulib b/gnulib index a3e2064..862a81c 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit a3e2064472d80c2e84ae7825ed29f79fe9d1db7c +Subproject commit 862a81c0e15448adde6a6e7473ec47e3a4bd91a6