06/26: DRAFT bootstrap: mes-minimal: Support ARM, update to mes-0.22-118.

[guix-commits]

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

commit 7f847ea20b90c2fb8dc3b5eb51e6c007a8c5461a
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun Dec 13 22:49:47 2020 +0100

    DRAFT bootstrap: mes-minimal: Support ARM, update to mes-0.22-118.
    
    XXX TODO: Inherit from mes instead of mes-next.
    
    * gnu/packages/make-bootstrap.scm (%mes-minimal): Inherit from mes-next;
    update to mes-0.22.118-g6b1465ab9.
    [arguments]: Support armhf-linux, aarch64-linux.
---
 gnu/packages/make-bootstrap.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 195ea22..39c293c 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -632,12 +632,14 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
   ;; A minimal Mes without documentation.
   (let ((triplet "i686-unknown-linux-gnu"))
     (package
-      (inherit mes-0.19)
+      (inherit mes-next)
       (name "mes-minimal")
       (native-inputs
        `(("guile" ,guile-2.2)))
       (arguments
-       `(#:system "i686-linux"
+       `(#:system ,(match (%current-system)
+                     ((or "i686-linux" "x86_64-linux") "i686-linux")
+                     ((or "armhf-linux" "aarch64-linux") "armhf-linux"))
          #:strip-binaries? #f
          #:configure-flags '("--mes")
          #:phases
@@ -649,8 +651,6 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                       (share (string-append out "/share")))
                  (delete-file-recursively (string-append out "/lib/guile"))
                  (delete-file-recursively (string-append share "/guile"))
-                 (delete-file-recursively (string-append share 
"/mes/scaffold"))
-
                  (for-each delete-file
                            (find-files
                             (string-append share "/mes/lib")