[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/70: bootstrap: diffuils-mesboot: Use Gash instead of coretutils&co.
From: |
guix-commits |
Subject: |
26/70: bootstrap: diffuils-mesboot: Use Gash instead of coretutils&co. |
Date: |
Sun, 15 Dec 2019 08:36:43 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 0a2ad649af0088144168f87a543ec82b31519c3d
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sun Sep 22 00:56:46 2019 +0200
bootstrap: diffuils-mesboot: Use Gash instead of coretutils&co.
* gnu/packages/commencement.scm (diffutils-mesboot): Use Gash instead of
coretutils&co.
---
gnu/packages/commencement.scm | 54 ++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 3585234..cab09d9 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1072,26 +1072,23 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
#t)))))))))
(define diffutils-mesboot
+ ;; The initial diffutils.
(package
(inherit diffutils)
(name "diffutils-mesboot")
(version "2.7")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/diffutils/diffutils-"
- version ".tar.gz"))
- (sha256
- (base32
- "1mirn5i825bn5w7rh6mgn0r8aj9xqanav95dwcl1b8sn82f4iwnm"))))
+ (source (bootstrap-origin
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/diffutils/diffutils-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1mirn5i825bn5w7rh6mgn0r8aj9xqanav95dwcl1b8sn82f4iwnm")))))
(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
@@ -1100,20 +1097,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
- 07/70: gnu: Remove mescc-tools-0.5.2., (continued)
- 07/70: gnu: Remove mescc-tools-0.5.2., guix-commits, 2019/12/15
- 11/70: Revert "bootstrap: bootstrap-mescc-tools: Update to mescc-tools-0.6.1.", guix-commits, 2019/12/15
- 14/70: Revert "bootstrap: mes-minimal: Update to mes-0.21.", guix-commits, 2019/12/15
- 12/70: Revert "gnu: Remove mescc-tools-0.5.2.", guix-commits, 2019/12/15
- 18/70: bootstrap: Add %bootstrap-mes-rewired., guix-commits, 2019/12/15
- 17/70: bootstrap: Add gash-core-utils-boot., guix-commits, 2019/12/15
- 15/70: bootstrap: Add %bootstrap-guile+guild., guix-commits, 2019/12/15
- 23/70: bootstrap: Add bzip2-mesboot., guix-commits, 2019/12/15
- 22/70: bootstrap: make-mesboot0: Use Gash instead of coreutils&co., guix-commits, 2019/12/15
- 20/70: bootstrap: tcc-boot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/15
- 26/70: bootstrap: diffuils-mesboot: Use Gash instead of coretutils&co.,
guix-commits <=
- 27/70: bootstrap: Add patch-mesboot., guix-commits, 2019/12/15
- 21/70: bootstrap: Add gzip-mesboot., guix-commits, 2019/12/15
- 24/70: bootstrap: Add bash-mesboot0., guix-commits, 2019/12/15
- 28/70: bootstrap: Add sed-mesboot0., guix-commits, 2019/12/15
- 32/70: bootstrap: mesboot-headers: Use Gash instead of coretutils&co., guix-commits, 2019/12/15
- 31/70: bootstrap: Add gawk-mesboot0., guix-commits, 2019/12/15
- 44/70: bootstrap: Add gcc-mesboot1: Use Gash instead of coreutils&co., guix-commits, 2019/12/15
- 48/70: bootstrap: glibc-headers-mesboot: Use Gash instead of coreutils&co., guix-commits, 2019/12/15
- 16/70: bootstrap: Add gash-boot., guix-commits, 2019/12/15
- 33/70: bootstrap: glibc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2019/12/15