me/guix
Archived
1
0
Fork 0
Code Activity

gnu: chez-scheme-for-racket: Support cross-compilation.

Browse source 
* gnu/packages/chez.scm (racket-cs-native-supported-system): Change to
return the applicable machine type instead of '#t'.
(chez-scheme-for-racket)[native-inputs]: When cross-compiling, add
'this-package'.
[arguments]<#:configure-flags>: When cross-compiling, supply '-m=' and
'--toolprefix='.
<#:phases>: Work around cross-compilation issues in 'build' and
'install-docs'.
(chez-scheme-for-racket-bootstrap-bootfiles): When cross-compiling,
use 'zuo' and 'chez-scheme-for-racket' instead of 'racket-vm-bc'.
[arguments]<#:phases>: Adapt 'build' phase for cross-compilation.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Philip McGrath 2022-08-27 14:55:50 -04:00 • committed by Ludovic Courtès
parent 47da722838
commit 9ed6e51ceb
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 70 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
gnu/packages/chez.scm
View file

@ -235,14 +235,15 @@ future."
(system (system
(or (%current-target-system) (or (%current-target-system)
(%current-system)))) (%current-system))))
"Can Racket's variant of Chez Scheme generate native code for SYSTEM? "Can Racket's variant of Chez Scheme generate native code for SYSTEM? If
Otherwise, SYSTEM can use only the ``portable bytecode'' backends." so, return the applicable machine type as a string. Otherwise, when SYSTEM
can use only the ``portable bytecode'' backends, return #f."
(let ((chez-arch (target-chez-arch system)) (let ((chez-arch (target-chez-arch system))
(chez-os (target-chez-os system))) (chez-os (target-chez-os system)))
(and (and=> (assoc-ref %chez-features-table chez-os) (and (and=> (assoc-ref %chez-features-table chez-os)
;; NOT assoc-ref: supported even if cdr is #f ;; NOT assoc-ref: supported even if cdr is #f
(cut assoc chez-arch <>)) (cut assoc chez-arch <>))
#t))) (string-append "t" chez-arch chez-os))))
;; ;;
;; Chez Scheme: ;; Chez Scheme:
@ -453,8 +454,12 @@ and 32-bit PowerPC architectures.")
(replace "chez-scheme-bootstrap-bootfiles" (replace "chez-scheme-bootstrap-bootfiles"
chez-scheme-for-racket-bootstrap-bootfiles))) chez-scheme-for-racket-bootstrap-bootfiles)))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs chez-scheme) (let ((native-inputs (modify-inputs (package-native-inputs chez-scheme)
(prepend zuo))) (prepend zuo))))
(if (%current-target-system)
(modify-inputs native-inputs
(prepend this-package))
native-inputs)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments chez-scheme) (substitute-keyword-arguments (package-arguments chez-scheme)
((#:out-of-source? _ #f) ((#:out-of-source? _ #f)
@ -468,6 +473,15 @@ and 32-bit PowerPC architectures.")
((#:configure-flags cfg-flags #~'()) ((#:configure-flags cfg-flags #~'())
#~`("--disable-x11" #~`("--disable-x11"
"--threads" ;; ok to potentially duplicate "--threads" ;; ok to potentially duplicate
#$@(if (%current-target-system)
(list (string-append "-m="
(racket-cs-native-supported-system?)))
'())
#$@(if (%current-target-system)
(list (string-append "--toolprefix="
(%current-target-system)
"-"))
'())
,@(let* ((chez+version (strip-store-file-name #$output)) ,@(let* ((chez+version (strip-store-file-name #$output))
(doc-prefix (assoc-ref %outputs "doc")) (doc-prefix (assoc-ref %outputs "doc"))
(doc-dir (string-append doc-prefix (doc-dir (string-append doc-prefix
@ -490,18 +504,42 @@ and 32-bit PowerPC architectures.")
#$mk-flags)) #$mk-flags))
((#:phases those-phases #~%standard-phases) ((#:phases those-phases #~%standard-phases)
#~(let* ((those-phases #$those-phases) #~(let* ((those-phases #$those-phases)
(unpack (assoc-ref those-phases 'unpack))) (gnu:unpack (assoc-ref those-phases 'unpack))
(gnu:build (assoc-ref those-phases 'build)))
(modify-phases those-phases (modify-phases those-phases
(replace 'build
;; need to override target for cross-compilation
;; https://racket.discourse.group/t/950/19
(lambda* (#:key target (make-flags '()) (parallel-build? #t)
#:allow-other-keys)
(gnu:build #:make-flags (if target
(cons "kernel" make-flags)
make-flags)
#:parallel-build? parallel-build?)))
(replace 'install-docs (replace 'install-docs
(lambda* (#:key make-flags #:allow-other-keys) (lambda* (#:key native-inputs (make-flags '())
#:allow-other-keys)
;; The tests for 'native-inputs' are cross-compilation
;; workarounds that would be better to address upstream:
;; see <https://racket.discourse.group/t/950/20>.
(when native-inputs
(substitute* "Makefile"
(("install-docs: build \\$[(]ZUO[)]")
"install-docs: $(ZUO)")))
(apply invoke (apply invoke
"make" "make"
"install-docs" "install-docs"
make-flags))) (if native-inputs
(cons (string-append
"Scheme="
(search-input-file native-inputs
"/bin/scheme"))
make-flags)
make-flags))))
(replace 'unpack (replace 'unpack
(lambda args (lambda args
(unpack #:source #$(or (package-source this-package) (gnu:unpack #:source #$(or (package-source this-package)
(package-source racket-vm-bc))))) (package-source racket-vm-bc)))))
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda args (lambda args
(chdir "racket/src/ChezScheme")))))))) (chdir "racket/src/ChezScheme"))))))))
@ -583,8 +621,12 @@ source.")))
(name "chez-scheme-for-racket-bootstrap-bootfiles") (name "chez-scheme-for-racket-bootstrap-bootfiles")
(version (package-version chez-scheme-for-racket)) (version (package-version chez-scheme-for-racket))
(source #f) ; avoid problematic cycle with racket.scm (source #f) ; avoid problematic cycle with racket.scm
(native-inputs (list chez-nanopass-bootstrap racket-vm-bc)) (native-inputs
;; TODO: cross compilation (cons* chez-nanopass-bootstrap
(if (%current-target-system)
(list zuo
chez-scheme-for-racket)
(list racket-vm-bc))))
(arguments (arguments
(substitute-keyword-arguments (substitute-keyword-arguments
(package-arguments chez-scheme-bootstrap-bootfiles) (package-arguments chez-scheme-bootstrap-bootfiles)
@ -604,9 +646,22 @@ source.")))
#$unpack-nanopass+stex)) #$unpack-nanopass+stex))
(add-before 'install 'build (add-before 'install 'build
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(invoke (search-input-file (or native-inputs inputs) #$(cond
"/opt/racket-vm/bin/racket") ((%current-target-system)
"rktboot/main.rkt")))))))) ;; cross-compiling
#~(invoke
(search-input-file (or native-inputs inputs)
"/bin/zuo")
"makefiles/boot.zuo"
(search-input-file (or native-inputs inputs)
"/bin/scheme")
#$(racket-cs-native-supported-system?)))
(else
;; bootstrapping
#~(invoke
(search-input-file (or native-inputs inputs)
"/opt/racket-vm/bin/racket")
"rktboot/main.rkt"))))))))))
(supported-systems (supported-systems
(package-supported-systems chez-scheme-for-racket)) (package-supported-systems chez-scheme-for-racket))
(home-page "https://github.com/racket/ChezScheme") (home-page "https://github.com/racket/ChezScheme")