From d6a3af7625f9f50194ba9ab832fef8209fddffa3 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 4 Dec 2019 18:49:39 +0100
Subject: [PATCH] build: Remove git dependency.

* configure: Remove git dependency.
* build-aux/GNUmakefile.in (clean,distclean, maintainer-clean):
Implement without git.
* INSTALL: Update dependencies.
---
 INSTALL                  |  1 -
 build-aux/GNUmakefile.in | 43 ++++++++++++++++++++++++----------------
 configure                | 13 +-----------
 guix/git/mes.scm         |  3 +--
 4 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/INSTALL b/INSTALL
index 554226d0..93da9350 100644
--- a/INSTALL
+++ b/INSTALL
@@ -32,7 +32,6 @@ similar way.
   - SH, /bin/sh, GNU Bash 4.3 is known to work.
   - GNU coreutils
   - sed, GNU sed 4.2 is known to work.
-  - git, 2.10 is known to work.
   - Perl, 5.22 is known to work.
 
 ** Build it
diff --git a/build-aux/GNUmakefile.in b/build-aux/GNUmakefile.in
index 53b05234..aa1707e8 100644
--- a/build-aux/GNUmakefile.in
+++ b/build-aux/GNUmakefile.in
@@ -97,27 +97,36 @@ build:
 src/${program_prefix}mes: build
 
 clean:
-	git clean -dfx\
-	    -e .config.make\
-	    -e config.sh\
-	    -e GNUmakefile\
-	    -e build.sh\
-	    -e check.sh\
-	    -e install.sh\
-	    -e uninstall.sh\
-	    -e pre-inst-env\
-	    -e scripts/mescc\
+	rm -f *.o *.s src/mes
+	rm -f mes.{aux,cp,cps,fn,info,log,tmp,toc,vr,vrs}
+	rm -f .log build.log
+	rm -f 0exit-42 0hello-mes exit-42 body-exit-42 body-hello-mes hello-mes
+	rm -f build-aux/mes-snarf.go
+	rm -f module/mescc.go
+	rm -f module/mes/*.go module/mescc/*.go
+	rm -f module/mescc/i386/*.go
+	rm -f module/mescc/x86_64/*.go
+	rm -rf gcc-lib/*.o gcc-lib/*.s gcc-lib/*.a gcc-lib/*-mes
+	rm -rf mescc-lib/*.o mescc-lib/*.s mescc-lib/*.a mescc-lib/*-mes
+	rm -f scaffold/boot/*.log scaffold/boot/*.trs
+	rm -f test-suite.log tests/*.log tests/*.trs
+	rm -f scaffold/*.s scaffold/*.o
+	rm -f doc/images/gcc-mesboot-graph.{eps,pdf,png}
+	rm -f doc/mes.1 doc/mesar.1 doc/mescc.1
+	rm -f .config .config.E .config.o
 
-#
-
-# Mes does not cache anything on the file system; therefore clean
-distclean:
-	git clean -dfX
+distclean: clean
+	rm -f GNUmakefile bootstrap.sh build.sh check.sh install.sh uninstall.sh
+	rm -f include/mes/config.h
+	rm -f .config.make config.sh mescc-lib/config.sh gcc-lib/config.sh
+	rm -f scripts/mesar scripts/mescc scripts/mescc.scm scripts/m2-merge
+	rm -f TAGS
 
 mostlyclean: clean
 
-maintainer-clean:
-	git clean -dfx
+maintainer-clean: distclean
+	rm -f doc/mes.info
+	rm -f doc/version.texi
 
 TAGS:
 	etags ${srcdest}lib/*.c ${srcdest}lib/*/*.c ${srcdest}src/*.c ${srcdest}include/*.h ${srcdest}include/sys/*.h
diff --git a/configure b/configure
index 12d8323f..581b518a 100755
--- a/configure
+++ b/configure
@@ -446,8 +446,7 @@ Some influential environment variables:
                              (make-dep "makeinfo" #:optional? #t)
                              (make-dep "dot" #:version-option "-V" #:optional? #t)
                              (make-dep "help2man" #:version '(1 47) #:optional? #t)
-                             (make-dep "perl" #:version '(5) #:optional? #t)
-                             (make-dep "git" #:version '(2) #:optional? #t))))
+                             (make-dep "perl" #:version '(5) #:optional? #t))))
            (guile (file-name "guile" deps))
            (deps (if guile (cons (check-program-version (make-dep "nyacc" #:version '(0 86 0) #:commands (list (string-append guile " -c '(use-modules (nyacc lalr)) (display *nyacc-version*)'")) #:file-name #t))
                                  deps)
@@ -543,15 +542,6 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
       (when (pair? missing)
         (stderr "\nMissing dependencies: ~a\n" (string-join (map dependency-name missing)))
         (exit 1))
-      (let ((git (find-dep "git" deps)))
-        (when (and git
-                   (not (file-exists? ".git")))
-          ;; Debian wants to run `make clean' from a tarball
-          (and (zero? (system* "git" "init"))
-               (zero? (system* "git" "add" "."))
-               (zero? (system* "touch" ".git-for-build"))
-               (zero? (system* "git" "commit" "--allow-empty" "-m" "Import mes")))))
-
       (let ((pairs `(("@PACKAGE@" . ,PACKAGE)
                      ("@PACKAGE_NAME@" . ,PACKAGE-NAME)
                      ("@PACKAGE_BUGREPORT@" . ,PACKAGE-BUGREPORT)
@@ -598,7 +588,6 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
                      ("@CC@" . ,(or (file-name "cc" deps) ""))
                      ("@DIFF@" . ,(or (file-name "diff" deps) (string-append abs-top-builddir "/pre-inst-env diff.scm")))
                      ("@DOT@" . ,(or (file-name "dot" deps) ""))
-                     ("@GIT@" . ,(or (file-name "git" deps) ""))
                      ("@GUILE@" . ,guile)
                      ("@GUIX@" . ,(or (file-name "guix" deps) ""))
                      ("@HELP2MAN@" . ,(or (file-name "help2man" deps) ""))
diff --git a/guix/git/mes.scm b/guix/git/mes.scm
index 4ac69801..36ca9682 100644
--- a/guix/git/mes.scm
+++ b/guix/git/mes.scm
@@ -138,8 +138,7 @@ extensive examples, including parsers for the Javascript and C99 languages.")
        `(("mescc-tools" ,mescc-tools)
          ("nyacc" ,nyacc)))
       (native-inputs
-       `(("git" ,git)
-         ("guile" ,guile-2.2)
+       `(("guile" ,guile-2.2)
          ,@(if (string-prefix? "x86_64-linux" (or (%current-target-system)
                                                   (%current-system)))
                ;; Use cross-compiler rather than #:system "i686-linux" to get