Mercurial > octave
changeset 28550:f00e92f9e85b stable
maint: update gnulib
* bootstrap.conf: update gnulib to latest revision
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=12c89745e39fb7b7dbdba732393dd0251202cadb
* bootstrap: update gnulib script via `./bootstrap --bootstrap-sync`
| author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
|---|---|
| date | Fri, 10 Jul 2020 11:39:06 +0900 |
| parents | f48162881819 |
| children | c89e1b6573e7 aa47120a505d |
| files | bootstrap bootstrap.conf |
| diffstat | 2 files changed, 3 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/bootstrap Fri Jul 10 11:26:21 2020 +0900 +++ b/bootstrap Fri Jul 10 11:39:06 2020 +0900 @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2019-01-04.17; # UTC +scriptversion=2020-04-13.15; # UTC # Bootstrap this package from checked-out sources. @@ -670,11 +670,6 @@ || cleanup_gnulib trap - 1 2 13 15 - - elif test -n "$GNULIB_REVISION" \ - && ! git --git-dir="$gnulib_path"/.git cat-file \ - commit "$GNULIB_REVISION"; then - git --git-dir="$gnulib_path"/.git fetch fi GNULIB_SRCDIR=$gnulib_path ;; @@ -975,7 +970,7 @@ # 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." + "Run 'git submodule update --init' and bootstrap again." fi # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
--- a/bootstrap.conf Fri Jul 10 11:26:21 2020 +0900 +++ b/bootstrap.conf Fri Jul 10 11:39:06 2020 +0900 @@ -189,7 +189,7 @@ # # To update the ./bootstrap file with that from ./gnulib/build-aux/bootstrap -: ${GNULIB_REVISION=9c5318955b42493ebb52220d8a4b197e93c11667} +: ${GNULIB_REVISION=12c89745e39fb7b7dbdba732393dd0251202cadb} # Don't check for translations since we don't have any in Octave yet. # This avoids the need for sha1sum or compatible utility in bootstrap.