Re: Difficulty trying to build distribution from CVS sources

[Joel E. Denny]

On Mon, 21 Apr 2008, Joel E. Denny wrote:

> On Mon, 21 Apr 2008, Joel E. Denny wrote:
> 
> > On Mon, 21 Apr 2008, Juan Manuel Guerrero wrote:
> 
> > > Sorry but it still does not work for me. ?It fails with the same infinite
> > > loop as reported some time ago.
> 
> > > I do not use git so I have nothing concerning git installed on my
> > > linux box. ?If i am missing something or something needs to be
> > > installed please let me know.
> > 
> > I just uninstalled git and tried again, and it still works for me.
> 
> Nuts, I messed up.  I'm able to reproduce the problem now when I don't 
> have git.  Requiring git is a little silly as long as Bison development is 
> in CVS.  There may be a fix for this already in gnulib.  I'll try to look 
> into it later today.

Well, it's a little later.  Let's see if I can get it right this time....

I recall now that I never rechecked make dist after switching to the new 
gnulib repository.  It turns out that there were changes to 
git-version-gen that broke make dist again.  I committed the following 
patch, which fixes it for me.  I tried with and without git installed.

I guess we need another sync with coreutils.  For example, it seems 
GNUmakefile is now part of gnulib, and it has updates too.

Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1782
diff -p -u -r1.1782 ChangeLog
--- ChangeLog   21 Apr 2008 06:54:38 -0000      1.1782
+++ ChangeLog   21 Apr 2008 18:13:52 -0000
@@ -1,5 +1,10 @@
 2008-04-21  Joel E. Denny  <address@hidden>
 
+       * GNUmakefile: Update git-version-gen invocation so make dist
+       succeeds.
+
+2008-04-21  Joel E. Denny  <address@hidden>
+
        Update to the current gnulib CVS repository, and fix trigraph handling
        in Bison.
        * bootstrap: Update gnulib CVS repository URL.
Index: GNUmakefile
===================================================================
RCS file: /sources/bison/bison/GNUmakefile,v
retrieving revision 1.5
diff -p -u -r1.5 GNUmakefile
--- GNUmakefile 21 Sep 2007 21:26:14 -0000      1.5
+++ GNUmakefile 21 Apr 2008 18:13:52 -0000
@@ -45,7 +45,7 @@ include Makefile
 ifeq (0,$(MAKELEVEL))
   _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS))
   ifneq (,$(_is-dist-target))
-    _curr-ver := $(shell build-aux/git-version-gen 0 .version)
+    _curr-ver := $(shell build-aux/git-version-gen .version)
     ifneq ($(_curr-ver),$(VERSION))
       $(info INFO: rerunning autoconf for new version string: $(_curr-ver))
       dummy := $(shell rm -rf autom4te.cache; $(AUTOCONF))