git-version-gen not working with Savannah/cgit snapshots

[G. Branden Robinson]

[please keep the groff list in CCs so its developers can see responses]

Hello gnulib team,

I'm trying to get groff shipshape for a release candidate and have been
trying many different build scenarios.  One issue that I noticed, as did
others long before me[3], is that the snapshot archives that Savannah's
cgit installation[1] produces don't work--they aren't buildable, even
once steps are taken to get an appropriate gnulib submodule in place.

Here is a portion of the instructions for this procedure[2].

Bootstrapping from a snapshot archive
-------------------------------------

Obtain groff's supported revision of gnulib and instruct the bootstrap
script where to find it.

Here is the output of "git submodule" for this groff release.

 c8b8f3bbcde37a53cd226f4c9cebd0dde6aca37f gnulib (v0.1-5208-gc8b8f3bbcd)

We therefore do the following.

  $ hash=c8b8f3bbcde37a53cd226f4c9cebd0dde6aca37f
  $ wget -O gnulib.tar.gz https://git.savannah.gnu.org/cgit/gnulib.git/\
snapshot/gnulib-$hash.tar.gz
  $ tar xf gnulib.tar.gz

Before we can proceed, we need to patch a bug in gnulib's
"git-version-gen" script.

--- build-aux/git-version-gen~  2022-06-03 18:34:08.175890973 +0000
+++ build-aux/git-version-gen   2022-06-03 17:51:02.221945195 +0000
@@ -189,7 +189,7 @@
     # Remove the "g" to save a byte.
     v=`echo "$v" | sed 's/-\([^-]*\)-g\([^-]*\)$/.\1-\2/'`;
     v_from_git=1
-elif test "x$fallback" = x || git --version >/dev/null 2>&1; then
+elif test "x$fallback" = x && ! git --version >/dev/null 2>&1; then
     v=UNKNOWN
 else
     v=$fallback

Place the foregoing in a file called "../git-version-gen.patch", apply
it, then run the bootstrap script.

  $ patch -d gnulib-$hash -p0 < ../git-version-gen.patch
  $ ./bootstrap --gnulib-srcdir=gnulib-$hash

References:

1. https://git.savannah.gnu.org/cgit/groff.git/
2. https://git.savannah.gnu.org/cgit/groff.git/tree/INSTALL.REPO
3. https://lists.gnu.org/archive/html/groff/2021-05/msg00049.html

Regards,
Branden

signature.asc
Description: PGP signature