Mercurial > octave

changeset 33469:321f49a98a85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Re-instate patch to fetch from upstream gnulib repository if needed. * build-aux/gnulib-bootstrap-git-fetch.diff: Re-instate patch that was deleted in c51b07a71421 and update it for the latest version of gnulib. * bootstrap-funclib.sh: Apply that patch to local copy of script. * bootstrap.conf: Revert change from c51b07a71421.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 26 Apr 2024 20:05:21 +0200
parents c51b07a71421
children fde38ca3c81f
files bootstrap-funclib.sh bootstrap.conf build-aux/gnulib-bootstrap-git-fetch.diff
diffstat 3 files changed, 28 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap-funclib.sh	Fri Apr 26 13:33:37 2024 -0400
+++ b/bootstrap-funclib.sh	Fri Apr 26 20:05: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," \
--- a/bootstrap.conf	Fri Apr 26 13:33:37 2024 -0400
+++ b/bootstrap.conf	Fri Apr 26 20:05:21 2024 +0200
@@ -200,7 +200,12 @@
 #
 #   ./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
 
 : ${GNULIB_REVISION=d4ec02b3cc70cddaaa5183cc5a45814e0afb2292}
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/build-aux/gnulib-bootstrap-git-fetch.diff	Fri Apr 26 20:05:21 2024 +0200
@@ -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," \