[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#57050] [PATCH v4 11/14] gnu: racket: Support cross-compiling the VM
From: |
Philip McGrath |
Subject: |
[bug#57050] [PATCH v4 11/14] gnu: racket: Support cross-compiling the VM packages. |
Date: |
Sat, 27 Aug 2022 14:55:51 -0400 |
Cross-compilation works for 'racket-vm-cgc', 'racket-vm-bc', and
'racket-vm-cs'. These changes are not enough to cross-compile
'racket-minimal' or 'racket': that would require building and loading
cross-compilation pluggins for 'racket-vm-cs', which will be much
easier once we can build the package 'raco-cross'.
* gnu/packages/racket.scm (racket-vm-cgc): Add 'this-package' when
cross-compiling.
(racket-vm-bc)[native-inputs]: Adjust accordingly.
(racket-vm-cs)[native-inputs]: Use 'racket-vm-cs' instead of
'racket-vm-bc' when cross-compiling. Adapt to changes to
'racket-vm-cgc'.
[arguments]<#:configure-flags>: Fix '--enable-scheme' for
cross-compilation.
---
gnu/packages/racket.scm | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm
index 349cf38e07..4fcdd2f721 100644
--- a/gnu/packages/racket.scm
+++ b/gnu/packages/racket.scm
@@ -312,8 +312,11 @@ (define-public racket-vm-cgc
(source %racket-origin)
(inputs (list ncurses ;; <- common to all variants (for #%terminal)
libffi)) ;; <- only for BC variants
- (native-inputs (list zuo ;; <- for all variants
- libtool)) ;; <- only for BC variants
+ (native-inputs (cons* zuo ;; <- for all variants
+ libtool ;; <- only for BC variants
+ (if (%current-target-system)
+ (list this-package)
+ '())))
(outputs '("out" "debug"))
(build-system gnu-build-system)
(arguments
@@ -401,8 +404,10 @@ (define-public racket-vm-bc
(inherit racket-vm-cgc)
(name "racket-vm-bc")
(native-inputs
- (modify-inputs (package-native-inputs racket-vm-cgc)
- (prepend racket-vm-cgc)))
+ (if (%current-target-system)
+ (package-native-inputs racket-vm-cgc)
+ (modify-inputs (package-native-inputs racket-vm-cgc)
+ (prepend racket-vm-cgc))))
(arguments
(substitute-keyword-arguments (package-arguments racket-vm-cgc)
((#:configure-flags _ '())
@@ -432,11 +437,17 @@ (define-public racket-vm-cs
(prepend zlib lz4)
(delete "libffi")))
(native-inputs
- (modify-inputs (package-native-inputs racket-vm-cgc)
- (delete "libtool")
- (prepend chez-scheme-for-racket
- chez-nanopass-bootstrap
- racket-vm-bc)))
+ (let ((native-inputs (package-native-inputs racket-vm-cgc)))
+ (modify-inputs (if (%current-target-system)
+ (modify-inputs native-inputs
+ (delete "racket-vm-cgc"))
+ native-inputs)
+ (delete "libtool")
+ (prepend chez-scheme-for-racket
+ chez-nanopass-bootstrap
+ (if (%current-target-system)
+ racket-vm-cs
+ racket-vm-bc)))))
(arguments
(substitute-keyword-arguments (package-arguments racket-vm-cgc)
((#:phases those-phases #~%standard-phases)
@@ -450,7 +461,7 @@ (define-public racket-vm-cs
"--enable-libz"
"--enable-lz4"
(string-append "--enable-scheme="
- #$(this-package-native-input
+ #+(this-package-native-input
"chez-scheme-for-racket")
"/bin/scheme")
#$racket-vm-common-configure-flags))))
--
2.32.0
- [bug#57050] [PATCH v4 06/14] gnu: chez-scheme: Fix use of "/bin/sh"., (continued)
- [bug#57050] [PATCH v4 06/14] gnu: chez-scheme: Fix use of "/bin/sh"., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 01/14] gnu: stex: Update to 1.2.2-2.afa6075., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 03/14] etc: teams: Add racket team., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 04/14] etc: teams: Add entry for Philip McGrath., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 08/14] gnu: racket: Update to 8.6., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 08/14] gnu: racket: Update to 8.6., Liliana Marie Prikler, 2022/08/27
- [bug#57050] [PATCH v4 08/14] gnu: racket: Update to 8.6., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 07/14] gnu: Add Zuo., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 09/14] gnu: chez-scheme: Make bootfiles regular inputs., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 10/14] gnu: chez-scheme-for-racket: Support cross-compilation., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 11/14] gnu: racket: Support cross-compiling the VM packages.,
Philip McGrath <=
- [bug#57050] [PATCH v4 13/14] gnu: racket-vm-bc: Add workaround for ppc64le., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 12/14] gnu: chez-scheme-for-racket: Support all systems., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v4 14/14] gnu: racket: Use Racket CS on all systems., Philip McGrath, 2022/08/27
- [bug#57050] [PATCH v2 05/13] gnu: racket: Update to 8.6., Philip McGrath, 2022/08/11
- [bug#57050] [PATCH v2 05/13] gnu: racket: Update to 8.6., Liliana Marie Prikler, 2022/08/11
- [bug#57050] [PATCH v2 05/13] gnu: racket: Update to 8.6., Philip McGrath, 2022/08/11
- [bug#57050] [PATCH v2 05/13] gnu: racket: Update to 8.6., Liliana Marie Prikler, 2022/08/12
- [bug#57050] [PATCH v2 05/13] gnu: racket: Update to 8.6., Efraim Flashner, 2022/08/22
- [bug#57050] [PATCH v2 05/13] gnu: racket: Update to 8.6., Philip McGrath, 2022/08/22
- [bug#57050] [PATCH v2 06/13] gnu: chez-scheme: Bootfiles should not be native inputs., Philip McGrath, 2022/08/11