Mercurial > octave
changeset 28551:c89e1b6573e7
maint: merge stable to default.
| author | Kai T. Ohlhus <k.ohlhus@gmail.com> |
|---|---|
| date | Fri, 10 Jul 2020 11:40:20 +0900 |
| parents | 605b9e811bf3 (current diff) f00e92f9e85b (diff) |
| children | eae3b1e3c6c4 |
| files | bootstrap.conf etc/GNULIB.UPDATE |
| diffstat | 3 files changed, 3 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/bootstrap Thu Jul 09 13:04:54 2020 -0400 +++ b/bootstrap Fri Jul 10 11:40:20 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 Thu Jul 09 13:04:54 2020 -0400 +++ b/bootstrap.conf Fri Jul 10 11:40:20 2020 +0900 @@ -192,7 +192,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.
--- a/etc/GNULIB.UPDATE Thu Jul 09 13:04:54 2020 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -## Instructions for updating gnulib on development branch - -## "cd" to a directory where you want to clone the gnulib repository and run: -git clone git://git.savannah.gnu.org/gnulib.git - -## If you already have a local gnulib git repository, pull the latest changes: -git pull - -## Query the commit id of the current head: -git rev-parse HEAD - -## Locate the line in bootstrap.conf starting with ": ${GNULIB_REVISION=" and -## replace the git commit id with the new one.