guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

11/26: commencement: mes-boot: Support ARM.


From: guix-commits
Subject: 11/26: commencement: mes-boot: Support ARM.
Date: Sat, 9 Jan 2021 13:30:48 -0500 (EST)

janneke pushed a commit to branch wip-arm-bootstrap
in repository guix.

commit d9c5bc38662251e3463f4dc3e9dd1ee05e4e2acc
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue Dec 15 19:39:24 2020 +0100

    commencement: mes-boot: Support ARM.
    
    * gnu/packages/commencement.scm (mes-boot)[native-inputs]: Upadate to
    nyacc-1.00.2.
    [arguments]: Cater for armhf-linux, aarch64-linux.
---
 gnu/packages/commencement.scm | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index c8d010f..43a0589 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -390,18 +390,10 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
   (package
     (inherit mes)
     (name "mes-boot")
-    (version "0.22")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnu/mes/"
-                                  "mes-" version ".tar.gz"))
-              (sha256
-               (base32
-                "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av"))))
     (inputs '())
     (propagated-inputs '())
     (native-inputs
-     `(("nyacc-source" ,(origin (inherit (package-source nyacc-0.99))
+     `(("nyacc-source" ,(origin (inherit (package-source nyacc-1.00.2))
                                 (snippet #f)))
        ("mes" ,%bootstrap-mes-rewired)
        ("mescc-tools" ,%bootstrap-mescc-tools)
@@ -430,10 +422,14 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
                (setenv "GUILE_LOAD_PATH"
                        (string-append
                         mes "/share/mes/module"
-                        ":" dir "/nyacc-0.99.0/module"))
+                        ":" dir "/nyacc-1.00.2/module"))
                (invoke "gash" "configure.sh"
                        (string-append "--prefix=" out)
-                       (string-append "--host=i686-linux-gnu")))))
+                       (string-append ,(match (%current-system)
+                                         ((or "armhf-linux" "aarch64-linux")
+                                          "--host=arm-linux")
+                                         ((or "i686-linux" "x86_64-linux")
+                                          "--host=i686-linux-gnu")))))))
          (replace 'build
            (lambda _
              (invoke "sh" "bootstrap.sh")))
@@ -471,7 +467,6 @@ $MES -e '(mescc)' module/mescc.scm -- \"$@\"
             (separator #f)
             (files '("")))))))
 
-
 (define tcc-boot0
   ;; Pristine tcc cannot be built by MesCC, we are keeping a delta of 11
   ;; patches.  In a very early and rough form they were presented to the



reply via email to

[Prev in Thread] Current Thread [Next in Thread]