From aa196f1f02afee706c4583d07a1fa34bdc18f0c8 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 22 Sep 2019 00:56:46 +0200
Subject: gnu: commencement: diffutils-mesboot: Use Gash instead of
 coretutils&co.

* gnu/packages/commencement.scm (diffutils-mesboot): Use Gash instead of
coretutils&co.
---
 gnu/packages/commencement.scm | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 21b78063be..9fcb69f433 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1049,6 +1049,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
                 #t)))))))))
 
 (define diffutils-mesboot
+  ;; The initial diffutils.
   (package
     (inherit diffutils)
     (name "diffutils-mesboot")
@@ -1063,12 +1064,7 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
     (supported-systems '("i686-linux" "x86_64-linux"))
     (inputs '())
     (propagated-inputs '())
-    (native-inputs `(("mes" ,mes-boot)
-                     ("tcc" ,tcc-boot)
-
-                     ("bash" ,%bootstrap-coreutils&co)
-                     ("coreutils" ,%bootstrap-coreutils&co)
-                     ("make" ,make-mesboot0)))
+    (native-inputs (%boot-tcc0-inputs))
     (arguments
      `(#:implicit-inputs? #f
        #:guile ,%bootstrap-guile
@@ -1077,20 +1073,29 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
        #:strip-binaries? #f   ; no strip yet
        #:phases
        (modify-phases %standard-phases
-         ;; diffutils-2.7 needs more traditional configure
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out"))
-                   (bash (assoc-ref %build-inputs "bash")))
-               (setenv "CONFIG_SHELL" (string-append bash "/bin/sh"))
-               (setenv "CC" "tcc")
-               (setenv "LD" "tcc")
-               (invoke "./configure" (string-append "--prefix=" out)))))
          (add-before 'configure 'remove-diff3-sdiff
            (lambda* (#:key outputs #:allow-other-keys)
              (substitute* "Makefile.in"
-               (("PROGRAMS = .*" all) "PROGRAMS = cmp diff"))
-             #t)))))))
+               (("PROGRAMS = .*" all) "PROGRAMS = cmp diff"))))
+         (replace 'configure           ; needs classic invocation of configure
+           (lambda* (#:key configure-flags #:allow-other-keys)
+             (let* ((out (assoc-ref %outputs "out"))
+                    (bash (assoc-ref %build-inputs "bash"))
+                    (shell (string-append bash "/bin/bash")))
+               (setenv "CONFIG_SHELL" shell)
+               (setenv "CC" "tcc")
+               (setenv "LD" "tcc")
+               (format (current-error-port)
+                       "running ./configure ~a\n" (string-join configure-flags))
+               (apply invoke (cons "./configure" configure-flags)))))
+         (replace 'install
+           (lambda _
+             (let* ((out (assoc-ref %outputs "out"))
+                    (bin (string-append out "/bin")))
+               (mkdir-p bin)
+               (install-file "cmp" bin)
+               (install-file "diff" bin)
+               #t))))))))
 
 (define binutils-mesboot0
   (package
-- 
cgit v1.2.3

/td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2021-12-05 23:09:55 +0100</td></tr>
<tr><th>committer</th><td>Ludovic Courtès &lt;ludo@gnu.org&gt;</td><td class='right'>2021-12-05 23:10:44 +0100</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/?id=90570b5e9f3da11a63e7c7865d44daddf2e366b5'>90570b5e9f3da11a63e7c7865d44daddf2e366b5</a> (<a href='/guix/patch/?id=90570b5e9f3da11a63e7c7865d44daddf2e366b5'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=90570b5e9f3da11a63e7c7865d44daddf2e366b5'>4cf19ba7e4c3ed6932f95ee31295ccc0944af2af</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/?id=2561f2720f6afdab47991e6430dc8a1215a27bc7'>2561f2720f6afdab47991e6430dc8a1215a27bc7</a> (<a href='/guix/diff/?id=90570b5e9f3da11a63e7c7865d44daddf2e366b5&amp;id2=2561f2720f6afdab47991e6430dc8a1215a27bc7'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-90570b5e9f3da11a63e7c7865d44daddf2e366b5.tar.gz'>guix-90570b5e9f3da11a63e7c7865d44daddf2e366b5.tar.gz</a><br/><a href='/guix/snapshot/guix-90570b5e9f3da11a63e7c7865d44daddf2e366b5.zip'>guix-90570b5e9f3da11a63e7c7865d44daddf2e366b5.zip</a><br/></td></tr></table>
<div class='commit-subject'>gnu: libsoup: Remove unneeded dependency on PHP.</div><div class='commit-msg'>* gnu/packages/gnome.scm (libsoup-minimal)[native-inputs]: Remove PHP.
</div><div class='diffstat-header'><a href='/guix/diff/?id=90570b5e9f3da11a63e7c7865d44daddf2e366b5'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/guix/diff/gnu/packages/gnome.scm?id=90570b5e9f3da11a63e7c7865d44daddf2e366b5'>gnu/packages/gnome.scm</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='2%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 100.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 0 insertions, 2 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm<br/>index 85643624fd..6e3dbdada8 100644<br/>--- a/<a href='/guix/tree/gnu/packages/gnome.scm?id=2561f2720f6afdab47991e6430dc8a1215a27bc7'>gnu/packages/gnome.scm</a><br/>+++ b/<a href='/guix/tree/gnu/packages/gnome.scm?id=90570b5e9f3da11a63e7c7865d44daddf2e366b5'>gnu/packages/gnome.scm</a></div>