gnulib: update
Akim Demaille <[email protected]> Wed, 15 Jun 2022 07:50:39 +0200
| Newsgroups | gmane.comp.parsers.bison.patches |
|---|---|
| Message-ID | <[email protected]> |
commit 8cd61aa72566d82be725b81ab9d4347f2d2d70dd Author: Akim Demaille <[email protected]> Date: Wed Jun 15 07:00:39 2022 +0200 gnulib: update diff --git a/bootstrap b/bootstrap index 63e76dee..1f375eef 100755 --- a/bootstrap +++ b/bootstrap @@ -1,10 +1,10 @@ #! /bin/sh # Print a version string. -scriptversion=3D2021-04-11.09; # UTC +scriptversion=3D2022-06-04.00; # UTC =20 # Bootstrap this package from checked-out sources. =20 -# Copyright (C) 2003-2021 Free Software Foundation, Inc. +# Copyright (C) 2003-2022 Free Software Foundation, Inc. =20 # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -487,7 +487,7 @@ fi =20 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in = configure.ac. found_aux_dir=3Dno -grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ +grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'])' configure.ac \ >/dev/null && found_aux_dir=3Dyes grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ >/dev/null && found_aux_dir=3Dyes @@ -763,9 +763,26 @@ if $use_gnulib; then shallow=3D if test -z "$GNULIB_REVISION"; then git clone -h 2>&1 | grep -- --depth > /dev/null && = shallow=3D'--depth 2' + git clone $shallow ${GNULIB_URL:-$default_gnulib_url} = "$gnulib_path" \ + || cleanup_gnulib + else + git fetch -h 2>&1 | grep -- --depth > /dev/null && = shallow=3D'--depth 2' + mkdir -p "$gnulib_path" + # 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 = needed to + # be processed, which can drastically reduce download and = processing + # time for checkout. If the fetch by commit fails, a shallow = fetch can + # not be performed because we do not know what the depth of the = commit + # is without fetching all commits. So fallback to fetching all = commits. + git -C "$gnulib_path" init + git -C "$gnulib_path" remote add origin \ + ${GNULIB_URL:-$default_gnulib_url} + git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" = \ + || git -C "$gnulib_path" fetch origin \ + || cleanup_gnulib + git -C "$gnulib_path" reset --hard FETCH_HEAD fi - git clone $shallow ${GNULIB_URL:-$default_gnulib_url} = "$gnulib_path" \ - || cleanup_gnulib =20 trap - 1 2 13 15 fi @@ -1093,7 +1110,7 @@ bootstrap_epilogue =20 echo "$0: done. Now you can run './configure'." =20 -# Local variables: +# Local Variables: # eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=3D" # time-stamp-format: "%:y-%02m-%02d.%02H" diff --git a/gnulib b/gnulib index 4bdc327d..d682f8de 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 4bdc327dbda59dcdbfa0f983a4f35c4a4ec3578c +Subproject commit d682f8de7f9d384f4cfc482a3ba2960329a8db21 diff --git a/lib/.gitignore b/lib/.gitignore index 374ccdd9..fac66ae4 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -371,7 +371,9 @@ /stdint.in.h /stdio--.h /stdio-impl.h +/stdio-read.c /stdio-safer.h +/stdio-write.c /stdio.h /stdio.in.h /stdlib.h