guix: mes: Add armhf-linux, aarch64-linux support.

* guix/git/mes.scm (mes): Add armhf-linux, aarch64-linux support.
This commit is contained in:
Jan Nieuwenhuizen 2020-06-04 13:22:39 +02:00 committed by Danny Milosavljevic
parent b0347bf53d
commit a44544bae9
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 43 additions and 36 deletions

View File

@ -121,11 +121,9 @@ extensive examples, including parsers for the Javascript and C99 languages.")
(license (list gpl3+ lgpl3+)))) (license (list gpl3+ lgpl3+))))
(define-public mes (define-public mes
(let ((triplet "i686-unknown-linux-gnu")
(version "0.22"))
(package (package
(name "mes") (name "mes")
(version version) (version "0.22")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -133,19 +131,28 @@ extensive examples, including parsers for the Javascript and C99 languages.")
(sha256 (sha256
(base32 #!mes!# "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n")))) (base32 #!mes!# "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("i686-linux" "x86_64-linux")) (supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux"))
(propagated-inputs (propagated-inputs
`(("mescc-tools" ,mescc-tools) `(("mescc-tools" ,mescc-tools)
("nyacc" ,nyacc))) ("nyacc" ,nyacc)))
(native-inputs (native-inputs
`(("guile" ,guile-2.2) `(("guile" ,guile-2.2)
,@(if (string-prefix? "x86_64-linux" (or (%current-target-system) ,@(cond ((string-prefix? "x86_64-linux" (or (%current-target-system)
(%current-system))) (%current-system)))
;; Use cross-compiler rather than #:system "i686-linux" to get ;; Use cross-compiler rather than #:system "i686-linux" to get
;; MesCC 64 bit .go files installed ready for use with Guile. ;; MesCC 64 bit .go files installed ready for use with Guile.
(let ((triplet "i686-unknown-linux-gnu"))
`(("i686-linux-binutils" ,(cross-binutils triplet)) `(("i686-linux-binutils" ,(cross-binutils triplet))
("i686-linux-gcc" ,(cross-gcc triplet))) ("i686-linux-gcc" ,(cross-gcc triplet)))))
'()) ((string-prefix? "aarch64-linux" (or (%current-target-system)
(%current-system)))
;; Use cross-compiler rather than #:system "armhf-linux" to get
;; MesCC 64 bit .go files installed ready for use with Guile.
(let ((triplet "arm-linux-gnueabihf"))
`(("arm-linux-binutils" ,(cross-binutils triplet))
("arm-linux-gcc" ,(cross-gcc triplet)))))
(else
'()))
("graphviz" ,graphviz) ("graphviz" ,graphviz)
("help2man" ,help2man) ("help2man" ,help2man)
("perl" ,perl) ; build-aux/gitlog-to-changelog ("perl" ,perl) ; build-aux/gitlog-to-changelog
@ -160,7 +167,7 @@ GNU/Linux distributions. It consists of a mutual self-hosting Scheme
interpreter in C and a Nyacc-based C compiler in Scheme and is compatible with interpreter in C and a Nyacc-based C compiler in Scheme and is compatible with
Guile.") Guile.")
(home-page "https://www.gnu.org/software/mes") (home-page "https://www.gnu.org/software/mes")
(license gpl3+)))) (license gpl3+)))
(define-public mes.git (define-public mes.git
(let ((version "0.22") (let ((version "0.22")