infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nongnu: wasi-libc: Update to sdk-19.

Browse Source 
* nongnu/packages/wasm.scm (wasi-libc): Update to sdk-19.
[native-inputs]: Use clang-15.
[arguments]<#:make-flags>: Add BULK_MEMORY_SOURCES=.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Pierre Langlois 2022-12-24 20:37:47 +00:00 committed by Jonathan Brielmaier
parent 64fded0af6
commit 46b008f905
No known key found for this signature in database
GPG Key ID: ECFC83988B4E4B9F
1 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
nongnu/packages/wasm.scm
View File

@ -1,5 +1,5 @@
;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; SPDX-License-Identifier: GPL-3.0-or-later
;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2022-2023 Pierre Langlois <pierre.langlois@gmx.com>
(define-module (nongnu packages wasm) (define-module (nongnu packages wasm)
#:use-module (guix base32) #:use-module (guix base32)
@ -16,53 +16,55 @@
#:use-module (gnu packages python)) #:use-module (gnu packages python))
(define-public wasi-libc (define-public wasi-libc
(let ((commit "ad5133410f66b93a2381db5b542aad5e0964db96") (package
(revision "1")) (name "wasi-libc")
(package (version "sdk-19")
(name "wasi-libc") (source (origin
(version (git-version "0.1-alpha" revision commit)) (method git-fetch)
(source (origin (uri (git-reference
(method git-fetch) (url "https://github.com/WebAssembly/wasi-libc")
(uri (git-reference (commit (string-append "wasi-" version))
(url "https://github.com/WebAssembly/wasi-libc") (recursive? #t)))
(commit commit) (file-name (git-file-name name version))
(recursive? #t))) (sha256
(file-name (git-file-name name version)) (base32
(sha256 "0bnpz8wk9wiic938296gxp4vz820bvpi1w41jksjzz5552hql169"))))
(base32 (build-system gnu-build-system)
"146jamq2q24vxjfpcwlqj84wzc80cbpbg0ns2wimyvzbanah48j6")))) (native-inputs (list clang-15))
(build-system gnu-build-system) (arguments
(native-inputs (list clang-13)) (list #:tests? #f ;No test suite
(arguments ;; Firefox uses wasm2c to compile WebAssembly to C code, and it
(list #:tests? #f ;No test suite ;; does not support the memory.copy opcode.
#:phases ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1773200#c4
#~(modify-phases %standard-phases #:make-flags ''("BULK_MEMORY_SOURCES=")
(delete 'configure) #:phases
(add-before 'build 'set-sysroot-include #~(modify-phases %standard-phases
(lambda _ (delete 'configure)
(setenv "C_INCLUDE_PATH" (add-before 'build 'set-sysroot-include
(string-append (getcwd) "/sysroot/include")))) (lambda _
(add-before 'install 'set-install-dir (setenv "C_INCLUDE_PATH"
(lambda _ (string-append (getcwd) "/sysroot/include"))))
(setenv "INSTALL_DIR" (add-before 'install 'set-install-dir
(string-append #$output "/wasm32-wasi"))))))) (lambda _
(home-page "https://wasi.dev") (setenv "INSTALL_DIR"
(synopsis "WASI libc implementation for WebAssembly") (string-append #$output "/wasm32-wasi")))))))
(description (home-page "https://wasi.dev")
"WASI Libc is a libc for WebAssembly programs built on top of WASI (synopsis "WASI libc implementation for WebAssembly")
(description
"WASI Libc is a libc for WebAssembly programs built on top of WASI
system calls. It provides a wide array of POSIX-compatible C APIs, including system calls. It provides a wide array of POSIX-compatible C APIs, including
support for standard I/O, file I/O, filesystem manipulation, memory support for standard I/O, file I/O, filesystem manipulation, memory
management, time, string, environment variables, program startup, and many management, time, string, environment variables, program startup, and many
other APIs.") other APIs.")
(license (list (license (list
;; For wasi-libc, with LLVM exceptions ;; For wasi-libc, with LLVM exceptions
license:asl2.0 license:asl2.0
;; For malloc.c. ;; For malloc.c.
license:cc0 license:cc0
;; For cloudlibc. ;; For cloudlibc.
license:bsd-2 license:bsd-2
;; For wasi-libc and musl-libc. ;; For wasi-libc and musl-libc.
license:expat))))) license:expat))))
(define-public wasm32-wasi-clang-runtime (define-public wasm32-wasi-clang-runtime
(package (inherit clang-runtime-13) (package (inherit clang-runtime-13)