me
/
guix
Archived
1
0
Fork 0
Code

gnu: commencement: diffutils-mesboot: Use Gash instead of coretutils&co. 

* gnu/packages/commencement.scm (diffutils-mesboot): Use Gash instead of
coretutils&co.
master
Jan Nieuwenhuizen 2019-09-22 00:56:46 +02:00
parent 1be3efb397
commit aa196f1f02
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gnu/packages/commencement.scm
View File

@ -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