[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/64: gnu: commencement: diffutils-mesboot: Use Gash instead of coretut
From: |
guix-commits |
Subject: |
14/64: gnu: commencement: diffutils-mesboot: Use Gash instead of coretutils&co. |
Date: |
Tue, 18 Feb 2020 01:18:02 -0500 (EST) |
janneke pushed a commit to branch core-updates
in repository guix.
commit aa196f1f02afee706c4583d07a1fa34bdc18f0c8
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sun Sep 22 00:56:46 2019 +0200
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(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 21b7806..9fcb69f 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
- 02/64: gnu: bootstrap: Add janneke's guix package url., (continued)
- 02/64: gnu: bootstrap: Add janneke's guix package url., guix-commits, 2020/02/18
- 04/64: gnu: commencement: Add gash-boot., guix-commits, 2020/02/18
- 06/64: gnu: commencement: Add %bootstrap-mes-rewired., guix-commits, 2020/02/18
- 05/64: gnu: commencement: Add gash-core-utils-boot., guix-commits, 2020/02/18
- 07/64: gnu: commencement: mes-boot: Use Gash instead of coretutils&co., guix-commits, 2020/02/18
- 09/64: gnu: commencement: Add gzip-mesboot., guix-commits, 2020/02/18
- 12/64: gnu: commencement: Add bash-mesboot0., guix-commits, 2020/02/18
- 08/64: gnu: commencement: tcc-boot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/18
- 10/64: gnu: commencement: make-mesboot0: Use Gash instead of coreutils&co., guix-commits, 2020/02/18
- 11/64: gnu: commencement: Add bzip2-mesboot., guix-commits, 2020/02/18
- 14/64: gnu: commencement: diffutils-mesboot: Use Gash instead of coretutils&co.,
guix-commits <=
- 13/64: gnu: commencement: tcc-boot: Use Gash instead of coretutils&co., guix-commits, 2020/02/18
- 15/64: gnu: commencement: Add patch-mesboot., guix-commits, 2020/02/18
- 22/64: gnu: commencement: gcc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/18
- 17/64: gnu: commencement: binutils-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/18
- 19/64: gnu: commencement: Add gawk-mesboot0., guix-commits, 2020/02/18
- 23/64: gnu: commencement: Add tar-mesboot., guix-commits, 2020/02/18
- 16/64: gnu: commencement: Add sed-mesboot0., guix-commits, 2020/02/18
- 20/64: gnu: commencement: mesboot-headers: Use Gash instead of coretutils&co., guix-commits, 2020/02/18
- 18/64: gnu: commencement: gcc-core-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/18
- 21/64: gnu: commencement: glibc-mesboot0: Use Gash instead of coretutils&co., guix-commits, 2020/02/18