* [bug#35753] [PATCH] gnu: mes: Prepare for non-x86 architectures.
@ 2019-05-15 15:42 Danny Milosavljevic
2019-05-15 16:53 ` [bug#35753] [PATCH v2] " Danny Milosavljevic
0 siblings, 1 reply; 3+ messages in thread
From: Danny Milosavljevic @ 2019-05-15 15:42 UTC (permalink / raw)
To: 35753
* gnu/packages/mes.scm (mes)[native-inputs]: Prepare for non-x86
architectures.
---
gnu/packages/mes.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index c45e267875..5c6b64150b 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -78,13 +78,16 @@ extensive examples, including parsers for the Javascript and C99 languages.")
("nyacc" ,nyacc)))
(native-inputs
`(("guile" ,guile-2.2)
- ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system)
- (%current-system))))
+ ,@(let ((target-system (or (%current-target-system)
+ (%current-system))))
+ (cond
+ ((string-prefix? "x86_64-linux" target-system)
;; Use cross-compiler rather than #:system "i686-linux" to get
;; MesCC 64 bit .go files installed ready for use with Guile.
`(("i686-linux-binutils" ,(cross-binutils triplet))
- ("i686-linux-gcc" ,(cross-gcc triplet)))
- '())
+ ("i686-linux-gcc" ,(cross-gcc triplet))))
+ (else
+ '())))
("graphviz" ,graphviz)
("help2man" ,help2man)
("perl" ,perl) ; build-aux/gitlog-to-changelog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#35753] [PATCH v2] gnu: mes: Prepare for non-x86 architectures.
2019-05-15 15:42 [bug#35753] [PATCH] gnu: mes: Prepare for non-x86 architectures Danny Milosavljevic
@ 2019-05-15 16:53 ` Danny Milosavljevic
2019-05-21 13:53 ` Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Danny Milosavljevic @ 2019-05-15 16:53 UTC (permalink / raw)
To: 35753
* gnu/packages/mes.scm (mes)[native-inputs]: Prepare for non-x86
architectures.
---
gnu/packages/mes.scm | 74 +++++++++++++++++++++++---------------------
1 file changed, 38 insertions(+), 36 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index c45e267875..afb1e025b4 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -60,46 +60,48 @@ extensive examples, including parsers for the Javascript and C99 languages.")
(license (list gpl3+ lgpl3+))))
(define-public mes
- (let ((triplet "i686-unknown-linux-gnu"))
- (package
- (name "mes")
- (version "0.19")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnu/mes/"
- "mes-" version ".tar.gz"))
- (sha256
- (base32
- "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
- (build-system gnu-build-system)
- (supported-systems '("i686-linux" "x86_64-linux"))
- (propagated-inputs
- `(("mescc-tools" ,mescc-tools)
- ("nyacc" ,nyacc)))
- (native-inputs
- `(("guile" ,guile-2.2)
- ,@(if (not (string-prefix? "i686-linux" (or (%current-target-system)
- (%current-system))))
- ;; Use cross-compiler rather than #:system "i686-linux" to get
- ;; MesCC 64 bit .go files installed ready for use with Guile.
- `(("i686-linux-binutils" ,(cross-binutils triplet))
- ("i686-linux-gcc" ,(cross-gcc triplet)))
- '())
- ("graphviz" ,graphviz)
- ("help2man" ,help2man)
- ("perl" ,perl) ; build-aux/gitlog-to-changelog
- ("texinfo" ,texinfo)))
- (arguments
- `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries
- (synopsis "Scheme interpreter and C compiler for full source bootstrapping")
- (description
- "GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed
+ (package
+ (name "mes")
+ (version "0.19")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/mes/"
+ "mes-" version ".tar.gz"))
+ (sha256
+ (base32
+ "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0"))))
+ (build-system gnu-build-system)
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (propagated-inputs
+ `(("mescc-tools" ,mescc-tools)
+ ("nyacc" ,nyacc)))
+ (native-inputs
+ `(("guile" ,guile-2.2)
+ ,@(let ((target-system (or (%current-target-system)
+ (%current-system))))
+ (cond
+ ((string-prefix? "x86_64-linux" target-system)
+ ;; Use cross-compiler rather than #:system "i686-linux" to get
+ ;; MesCC 64 bit .go files installed ready for use with Guile.
+ `(("i686-linux-binutils" ,(cross-binutils "i686-unknown-linux-gnu"))
+ ("i686-linux-gcc" ,(cross-gcc "i686-unknown-linux-gnu"))))
+ (else
+ '())))
+ ("graphviz" ,graphviz)
+ ("help2man" ,help2man)
+ ("perl" ,perl) ; build-aux/gitlog-to-changelog
+ ("texinfo" ,texinfo)))
+ (arguments
+ `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries
+ (synopsis "Scheme interpreter and C compiler for full source bootstrapping")
+ (description
+ "GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed
bootstrap to Guix and aims to help create full source bootstrapping for
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
Guile.")
- (home-page "https://gnu.org/software/mes")
- (license gpl3+))))
+ (home-page "https://gnu.org/software/mes")
+ (license gpl3+)))
(define-public mescc-tools
(package
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#35753] [PATCH v2] gnu: mes: Prepare for non-x86 architectures.
2019-05-15 16:53 ` [bug#35753] [PATCH v2] " Danny Milosavljevic
@ 2019-05-21 13:53 ` Ludovic Courtès
0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2019-05-21 13:53 UTC (permalink / raw)
To: Danny Milosavljevic; +Cc: 35753
Hi Danny,
Danny Milosavljevic <dannym@scratchpost.org> skribis:
> * gnu/packages/mes.scm (mes)[native-inputs]: Prepare for non-x86
> architectures.
Please describe the change in terms of what’s added/remove from
‘native-inputs’.
> + (native-inputs
> + `(("guile" ,guile-2.2)
> + ,@(let ((target-system (or (%current-target-system)
> + (%current-system))))
> + (cond
> + ((string-prefix? "x86_64-linux" target-system)
> + ;; Use cross-compiler rather than #:system "i686-linux" to get
> + ;; MesCC 64 bit .go files installed ready for use with Guile.
> + `(("i686-linux-binutils" ,(cross-binutils "i686-unknown-linux-gnu"))
> + ("i686-linux-gcc" ,(cross-gcc "i686-unknown-linux-gnu"))))
> + (else
> + '())))
LGTM, thanks!
Looking forward to Mes on ARM!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-21 13:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-15 15:42 [bug#35753] [PATCH] gnu: mes: Prepare for non-x86 architectures Danny Milosavljevic
2019-05-15 16:53 ` [bug#35753] [PATCH v2] " Danny Milosavljevic
2019-05-21 13:53 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).