Mercurial > octave

changeset 33471:43d752ef4a4c bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge default to bytecode-interpreter
author John W. Eaton <jwe@octave.org>
date Fri, 26 Apr 2024 14:26:26 -0400
parents b295be7a77ca (current diff) fde38ca3c81f (diff)
children 20bfa13c31bb
files
diffstat 3 files changed, 33 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap-funclib.sh	Fri Apr 26 13:39:19 2024 -0400
+++ b/bootstrap-funclib.sh	Fri Apr 26 14:26:26 2024 -0400
@@ -532,6 +532,10 @@
         # The subdirectory 'gnulib' already exists.
         if test -n "$GNULIB_REVISION"; then
           if test -d "$gnulib_path/.git"; then
+            if ! git --git-dir="$gnulib_path"/.git cat-file \
+                 commit "$GNULIB_REVISION"; then
+              git --git-dir="$gnulib_path"/.git fetch
+            fi
             (cd "$gnulib_path" && git checkout "$GNULIB_REVISION") || exit 1
           else
             die "Error: GNULIB_REVISION is specified in bootstrap.conf," \
--- a/bootstrap.conf	Fri Apr 26 13:39:19 2024 -0400
+++ b/bootstrap.conf	Fri Apr 26 14:26:26 2024 -0400
@@ -200,7 +200,17 @@
 #
 #   ./bootstrap --bootstrap-sync
 #
-# to update the ./bootstrap file from the selected gnulib revision.
+# to update the ./bootstrap file from the selected gnulib revision,
+# followed by
+#
+#   patch -p1 -u < ./build-aux/gnulib-bootstrap-git-fetch.diff
+#
+# to apply local changes from build-aux/gnulib-bootstrap-git-fetch.diff
+#
+# The patch is needed to automatically update gnulib repos that have not
+# been updated to contain $GNULIB_REVISION.
+#
+# See also: https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00150.html
 
 : ${GNULIB_REVISION=d4ec02b3cc70cddaaa5183cc5a45814e0afb2292}
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-aux/gnulib-bootstrap-git-fetch.diff	Fri Apr 26 14:26:26 2024 -0400
@@ -0,0 +1,18 @@
+Update bootstrap script from upstream gnulib to automatically fetch from repository if needed
+
+See also: https://lists.gnu.org/archive/html/bug-gnulib/2020-08/msg00150.html
+
+diff -r c51b07a71421 bootstrap-funclib.sh
+--- a/bootstrap-funclib.sh	Fri Apr 26 13:33:37 2024 -0400
++++ b/bootstrap-funclib.sh	Fri Apr 26 20:00:21 2024 +0200
+@@ -532,6 +532,10 @@
+         # The subdirectory 'gnulib' already exists.
+         if test -n "$GNULIB_REVISION"; then
+           if test -d "$gnulib_path/.git"; then
++            if ! git --git-dir="$gnulib_path"/.git cat-file \
++                 commit "$GNULIB_REVISION"; then
++              git --git-dir="$gnulib_path"/.git fetch
++            fi
+             (cd "$gnulib_path" && git checkout "$GNULIB_REVISION") || exit 1
+           else
+             die "Error: GNULIB_REVISION is specified in bootstrap.conf," \