janneke pushed a commit to branch wip-bootstrap in repository guix. commit a56776dc3dc11ee033b96e2bbc65f3c7a50b23c1 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Thu Jul 12 08:43:19 2018 +0200
gnu: mes-boot: Update to 0.16.1; revise dependencies. * gnu/packages/mes.scm (mes-boot): Update to 0.16.1; revise dependencies. --- gnu/packages/mes.scm | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 98ccf2c..98b3150 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -218,9 +218,9 @@ hex2 linker.") (license gpl3+))))) (define-public mes-boot - (let ((version "0.16") + (let ((version "0.16.1") (revision "0") - (commit "f9a4e219727bedd504ea49885c3260c38755c1d0")) + (commit "6a48f4a81431d4357057ff928a7df880e3f3e6b4")) (package-with-bootstrap-guile (package (name "mes-boot") @@ -233,14 +233,11 @@ hex2 linker.") "/mes-" commit ".tar.gz")) (sha256 (base32 - "1rvk2drps0g0klljw190ljpfd28bfpw9iw2n6s3lrw6ch7x8jgpn")))) + "1d1sfp54j8wsvv10mlsr4bh3n7fb70hhb164kldsrrixw6sk0nvi")))) (build-system trivial-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs - `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash")) - ("bash" ,(search-bootstrap-binary "bash" (%current-system))) - ("tar" ,(search-bootstrap-binary "tar" (%current-system))) - ("xz" ,(search-bootstrap-binary "xz" (%current-system))) + `(("coreutils" , %bootstrap-coreutils&co) ("mescc-tools" ,mescc-tools-boot) ("nyacc-source" ,(package-source nyacc-boot)) ("mes-seed" ,%mes-seed) @@ -253,12 +250,10 @@ hex2 linker.") #:builder (begin (use-modules (guix build utils)) - (let* ((bash (assoc-ref %build-inputs "static-bash")) + (let* ((coreutils (assoc-ref %build-inputs "coreutils")) (guile (assoc-ref %build-inputs "guile")) (srfi-43 (assoc-ref %build-inputs "srfi-43")) (mescc-tools (assoc-ref %build-inputs "mescc-tools")) - (tar (assoc-ref %build-inputs "tar")) - (xz (assoc-ref %build-inputs "xz")) (source (assoc-ref %build-inputs "source")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) (mes-seed (assoc-ref %build-inputs "mes-seed")) @@ -267,11 +262,9 @@ hex2 linker.") ;; unpack (setenv "PATH" (string-append - bash "/bin:" - (if guile (string-append guile "/bin:") "") - mescc-tools "/bin:" - tar "/bin:" - xz "/bin")) + coreutils "/bin" + (if guile (string-append ":" guile "/bin") "") + ":" mescc-tools "/bin")) (format (current-error-port) "PATH=~s\n" (getenv "PATH")) (mkdir-p "source") (system* "tar" "--strip=1" "-C" "source" "-xvf" source) @@ -285,7 +278,7 @@ hex2 linker.") (chdir "source") ;; configure - (setenv "PREFIX" out) + (setenv "prefix" out) ;; (setenv "BUILD_DEBUG" "1") (if ,%fake-bootstrap? @@ -327,7 +320,7 @@ hex2 linker.") (zero? (system* "sh" "check.sh"))) ;; install - (setenv "SHELL" (string-append bash "/bin/bash")) + (setenv "SHELL" (string-append coreutils "/bin/bash")) (zero? (system* "sh" "install.sh"))))))) (description "Mes [Maxwell Equations of Software] aims to create full source