janneke pushed a commit to branch wip-bootstrap in repository guix. commit 89fd946847be7d3ccb385829d6fe89e31e492750 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Mon Sep 3 11:51:11 2018 +0200
gnu: diffutils-mesboot: Cleanup. * gnu/packages/commencement.scm (diffutils-mesboot): Cleanup. --- gnu/packages/commencement.scm | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2e06e20..b70f68b 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -635,28 +635,23 @@ `(#:implicit-inputs? #f #:guile ,%bootstrap-guile #:parallel-build? #f - ;;FIXME: why doesn't this work? - ;;#:make-flags '("PROGRAMS=\"cmp diff\"") #:tests? #f ; check is naive, also checks non-built PROGRAMS + #: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")))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (unsetenv "C_INCLUDE_PATH") - (unsetenv "LIBRARY_PATH") - (setenv "CONFIG_SHELL" (string-append - (assoc-ref %build-inputs "bash") - "/bin/sh")) - (setenv "CC" "tcc -static") - (setenv "CPP" "tcc -E") - (zero? - (system* "./configure" - (string-append "--prefix=" out)))))))))))) + (("PROGRAMS = .*" all) "PROGRAMS = cmp diff")))))))))) (define-public binutils-mesboot0