From patchwork Tue Apr 8 19:58:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 41466 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6892B27BC4B; Tue, 8 Apr 2025 20:59:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B4E9827BC49 for ; Tue, 8 Apr 2025 20:59:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2F6L-0007Pm-IH; Tue, 08 Apr 2025 15:59:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2F68-0007EU-VY for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2F67-0003Ru-A8 for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=+YzOMYgEd66FjCF+pM2fVAm11Tjatsfkycc89Wubzk4=; b=nTi2J6lvVxv4fr52eo/ApmXw6ll+sEQ3U0QeK9gYn2LxeSV66A0DDtFW6uWb1XJ3uODZzSJ2OhfOQCKLBGcBuwdfkvtchUTOEbXPUfG/6iw8H5QCyiOwg9QuLPQec7d2K86upi69j7WfRebRgXQAxTa1KJGF18w4gNKLZdQ8oyHwYIbML+wd9XEreE/QDpyp2vdZi+srSueOW4IZRPnxCOVat1BOKfUCJushsTsPuCgKnOX5z5wvp27S6qhjhve3Pfd8upTgomxZUrYvc39l2rIZWV/ginhSFLfWEEZfodzBIiP6uag3akyYzlfCMedCIjQu+zR1pPPqvnIGw69IrQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2F67-0000N0-3t for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77653] [PATCH 1/4] gnu: Add wasi-libc. References: <20250408195720.2021-1-ian@retrospec.tv> In-Reply-To: <20250408195720.2021-1-ian@retrospec.tv> Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Apr 2025 19:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77653@debbugs.gnu.org Cc: Ian Eure Received: via spool by 77653-submit@debbugs.gnu.org id=B77653.17441423281364 (code B ref 77653); Tue, 08 Apr 2025 19:59:03 +0000 Received: (at 77653) by debbugs.gnu.org; 8 Apr 2025 19:58:48 +0000 Received: from localhost ([127.0.0.1]:35617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2F5s-0000Lv-1u for submit@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:48 -0400 Received: from fhigh-a7-smtp.messagingengine.com ([103.168.172.158]:56195) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2F5k-0000L8-Ej for 77653@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:41 -0400 Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id A81361140177; Tue, 8 Apr 2025 15:58:34 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Tue, 08 Apr 2025 15:58:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm1; t=1744142314; x=1744228714; bh=+Y zOMYgEd66FjCF+pM2fVAm11Tjatsfkycc89Wubzk4=; b=MdyQNx6jw/2Q1IJlXZ 2H6cagdc1yiNIjyzh6aOkYXs/Jky8deyboxBv4Et28fDcw6zJTT353ruYPTtYFCY 0KOjpDyELZLeK1p27Qk6pmzTQtgdIy5fdp6p5AmY3F2LHH7pV3aEpSpDcNOI6pzw 0ijSgIbZU41iD1MjANDQUnZtM61ROZvDMFZfBv8vJTlDvLVa9scGW2CDstKST1jo 6Uyor8qfN5sKZCR9zDVwAdBoFyKKb4JTptLOiIp8BdTAVgsPWGAWTJzspX0dZawT 63F5j1AyKboa9k7FXBjlnYoNYqyd3TfAcq6Uw7RmpNjSaRkRBWXersUizszqjigY BRXA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1744142314; x=1744228714; bh=+YzOMYgEd66FjCF+pM2fVAm11Tja tsfkycc89Wubzk4=; b=HzH6MNcqxFQ1uhZUY9OC3fpo3aVmDVIda1As4+PwL9/R Eg+L0zKL5Yt8DXvhsWYIMKAZREt6DCzk+acSdXhx1x0m3Zx9dMn3hrCaZFF0yyvi VRqfrdUicdfy5ZX2+EQ/+p+nbDAhXEfoNw6wcGjSyR2cDhu6gUCsXqBKlS2Oh0E6 2naGnz7sH8R5AStJ5IBgvJlRFnWwx9MS8yUdC8s7uWXdmaSKZVbLTYiKXfR/CJEa iz60fuQm5mKgAvIAjH5HfZjJy84LpGSym41EW91FZrTY6Ya5n++nHiXVio2daZMw 4KgRgChb3nt1HvyELFFIsKXdwjN4dQ4BUQi6vXTLfA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtdefleelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffogggtgfesthekredtredtjeenucfhrhhomhepkfgrnhcugfhurhgvuceoihgr nhesrhgvthhrohhsphgvtgdrthhvqeenucggtffrrghtthgvrhhnpeduveefjeeijefgff efhffhveffleeffeejvdetgeegffevheejvddtvdeuheekveenucffohhmrghinhepghhn uhdrohhrghdpghhithhhuhgsrdgtohhmpdhmohiiihhllhgrrdhorhhgpdifrghsihdrug gvvhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehi rghnsehrvghtrhhoshhpvggtrdhtvhdpnhgspghrtghpthhtohepvddpmhhouggvpehsmh htphhouhhtpdhrtghpthhtohepjeejieehfeesuggvsggsuhhgshdrghhnuhdrohhrghdp rhgtphhtthhopehirghnsehrvghtrhhoshhpvggtrdhtvh X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 8 Apr 2025 15:58:33 -0400 (EDT) From: Ian Eure Date: Tue, 8 Apr 2025 12:58:26 -0700 Message-ID: <20250408195830.2084-1-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wasm.scm (wasi-libc): New variable. Change-Id: I1aefc4573424e19119d225904b5461b1bea0221e --- gnu/packages/wasm.scm | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 gnu/packages/wasm.scm diff --git a/gnu/packages/wasm.scm b/gnu/packages/wasm.scm new file mode 100644 index 0000000000..060e1e420f --- /dev/null +++ b/gnu/packages/wasm.scm @@ -0,0 +1,78 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022-2023 Pierre Langlois +;;; Copyright © 2023, 2024, 2025 Ian Eure +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages wasm) + #:use-module (gnu packages llvm) + #:use-module (guix base32) + #:use-module (guix build-system gnu) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages)) + +(define-public wasi-libc + (package + (name "wasi-libc") + (version "sdk-20") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WebAssembly/wasi-libc") + (commit (string-append "wasi-" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0knm5ch499dksmv1k0kh7356pjd9n1gjn0p3vp9bw57mn478zp8z")))) + (build-system gnu-build-system) + (native-inputs (list clang-16)) + (arguments + (list #:tests? #f ;No test suite + ;; Firefox uses wasm2c to compile WebAssembly to C code, and it + ;; does not support the memory.copy opcode. + ;; See https://bugzilla.mozilla.org/show_bug.cgi?id=1773200#c4 + #:make-flags ''("BULK_MEMORY_SOURCES=") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-sysroot-include + (lambda _ + (setenv "C_INCLUDE_PATH" + (string-append (getcwd) "/sysroot/include")))) + (add-before 'install 'set-install-dir + (lambda _ + (setenv "INSTALL_DIR" + (string-append #$output "/wasm32-wasi"))))))) + (home-page "https://wasi.dev") + (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 +support for standard I/O, file I/O, filesystem manipulation, memory +management, time, string, environment variables, program startup, and many +other APIs.") + (license (list + ;; For wasi-libc, with LLVM exceptions + license:asl2.0 + ;; For malloc.c. + license:cc0 + ;; For cloudlibc. + license:bsd-2 + ;; For wasi-libc and musl-libc. + license:expat)))) From patchwork Tue Apr 8 19:58:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 41464 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4374127BC4E; Tue, 8 Apr 2025 20:59:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D6B7427BC4A for ; Tue, 8 Apr 2025 20:59:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2F6I-0007Md-TM; Tue, 08 Apr 2025 15:59:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2F68-0007EV-VX for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2F66-0003Rt-RP for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=MhWjfuDkwmIihm2LinIJt4s354N2QSFCeszYtmRdYsE=; b=PxLPAkASg26dwPDbmxzwlSjuiAJ3hfkEjHodxk5ObkYOdW0uT7uw4iG16ClSFftEGzEUYZ/aevL5quOy/9mo4He1YGJ+XZy/35i5twDad5JoAiFxkskCkfHWkKNYqH9NNvIIW0aZGw4wZ1xTePbFiPPw6CVGVh7S/nLTfToK+4z/y82JoNQf4KUkftLBejZ4bPoAJeEfb6yGqVCfDknu4jgbAxGZskZV1RUpxPEv85MLVcsjJTjumm7yjTN6tlYyWzbi40lAkHpEmQzcO1Z/fMuQMUo1ake1aTHQ7aMM8FiB6SuguF4TGXUowfwkIMISPeyuvMpWhMwLBZhbQIspIA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2F66-0000Mq-Il for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77653] [PATCH 2/4] gnu: Add wasm32-wasi-clang-runtime. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Apr 2025 19:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77653@debbugs.gnu.org Cc: Ian Eure Received: via spool by 77653-submit@debbugs.gnu.org id=B77653.17441423241349 (code B ref 77653); Tue, 08 Apr 2025 19:59:02 +0000 Received: (at 77653) by debbugs.gnu.org; 8 Apr 2025 19:58:44 +0000 Received: from localhost ([127.0.0.1]:35615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2F5n-0000Lg-Hz for submit@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:43 -0400 Received: from fout-a4-smtp.messagingengine.com ([103.168.172.147]:42083) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2F5k-0000LA-OR for 77653@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:41 -0400 Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfout.phl.internal (Postfix) with ESMTP id 7EF8B13801BF; Tue, 8 Apr 2025 15:58:35 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Tue, 08 Apr 2025 15:58:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1744142315; x= 1744228715; bh=MhWjfuDkwmIihm2LinIJt4s354N2QSFCeszYtmRdYsE=; b=F q1tkOJrbq1k+ORSQxDj3nGr1AO6kuOQWpEml2MXuDHXTPZpGMnh019/J/nBMxhCI zDNLcn47zxgqgggl82eHPKhZstWMn3M5NSlFx0pPaencb5ttWUdoYknMDUqH9YpY 2a+PtVccyYPd0iV02o8IX9aAQRhBul3bLkNZpLJkMPoi3Mp8naiAK5+qdqNeKGII OLRu7fplY9Dw0Hqkt8UclSaGxg25OTJgGxM8wYQoIx6o7v+G0/kbr8sYUA2CeGCB 8hbg7ExFT/v9NTrumdyQ6Eyfzf7yMUS6Js+akpAgZ+8sebAHL6zNDdfqgADcCo77 QFsbAkdnQYG5koZ86mzzw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1744142315; x=1744228715; bh=M hWjfuDkwmIihm2LinIJt4s354N2QSFCeszYtmRdYsE=; b=Q1O3e51sUedVZMXei MoZQslqknn0EdE8XrQi2u9D42VmlTwkRYfHVEa2/KuXKLuxxrNI/EIgTBc1esql4 8GcaVtICxRNLfckbMZqieqd5/62h4Hf3mqqcC7hn/gBRpbo/Clu8wuzNLVEAgHwS Rq89vY05aGKN9JoojK0kErY/oLYpBYqo2O9jo3JumYMT5RBb0guHtVnTPAk7K04U XmYnVJfxC2/y6LfHbFmsXPtqYGPo5Thi+w+gxJQNx9HWc+64ZsYuVpRgt7spd090 WxNT2FUK9BcbdOCQfbeoL+rZxot3n0NkOhl6eCbscACTeoEYxDynjEDJSiK5mGy9 TndMw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtdefleelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepveevjeffuddvte eiueetgfeukedvfeeiuedvveelfeeghfduleeftedvgfefgeejnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtg drthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peejjeeiheefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrh gvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 8 Apr 2025 15:58:34 -0400 (EDT) From: Ian Eure Date: Tue, 8 Apr 2025 12:58:27 -0700 Message-ID: <20250408195830.2084-2-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408195830.2084-1-ian@retrospec.tv> References: <20250408195830.2084-1-ian@retrospec.tv> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wasm.scm (wasm32-wasi-clang-runtime): New variable. Change-Id: Ib0465fdc86086451782d533380a8966cdde6dc1e --- gnu/packages/wasm.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/wasm.scm b/gnu/packages/wasm.scm index 060e1e420f..53ea31f4a7 100644 --- a/gnu/packages/wasm.scm +++ b/gnu/packages/wasm.scm @@ -76,3 +76,33 @@ (define-public wasi-libc license:bsd-2 ;; For wasi-libc and musl-libc. license:expat)))) + +(define-public wasm32-wasi-clang-runtime + (package (inherit clang-runtime-16) + (native-inputs + (list clang-16 + wasi-libc)) + (inputs (list llvm-16)) + (arguments + (list + #:build-type "Release" + #:tests? #f + ;; Stripping binaries breaks wasm linking, resulting in the following + ;; error: "archive has no index; run ranlib to add one". + #:strip-binaries? #f + #:configure-flags + #~(list "-DCMAKE_C_COMPILER=clang" + "-DCMAKE_C_COMPILER_TARGET=wasm32-wasi" + (string-append + "-DCMAKE_SYSROOT=" #$wasi-libc "/wasm32-wasi") + (string-append + "-DCMAKE_C_FLAGS=-I " #$wasi-libc "/wasm32-wasi/include") + + "-DCOMPILER_RT_OS_DIR=wasi" + + "-DCOMPILER_RT_BAREMETAL_BUILD=On" + "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=On" + + ;; WASM only needs libclang_rt.builtins-wasm32.a from + ;; compiler-rt. + "../source/compiler-rt/lib/builtins"))))) From patchwork Tue Apr 8 19:58:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 41465 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DBF5027BC4A; Tue, 8 Apr 2025 20:59:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DDC9A27BC4C for ; Tue, 8 Apr 2025 20:59:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2F6B-0007IB-GQ; Tue, 08 Apr 2025 15:59:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2F68-0007EW-5q for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2F67-0003Rx-Rc for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=CKE9h4Q974/sAw7NUwUqGQ4rKmHKHHsI63d2Osz6how=; b=E6RYxVvBFW66uWxSMCqJa7YSNvHjvwiy94/tEMvGulGwEG3f3Uon4klCKnpT1OnskBOlwooDp79IebWB+XopNP6hx1wlVs+XVJVwUp5mkCVR5m1dJKJLkIi4gI6/ApliCoKnTIPEORS6CjbkWucLC1OEzaA054ulZe9hrdwba0LlhAWgE+jKo56SDP64WIM4JMmucr3VrSiwZ5w4iRvXrTdhLhY7EkTb5yxqMsh1JCvLyLVddm0Qtqqv/5qC1RoO37v//Dn+SH8lGF9DCr0lKJvub10NC/j7S43KM5gnA0TFW/yuxrW+ZM6yPqira3U8iGmcbtDtkZsjixMAxhuYgw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2F67-0000N7-JD for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77653] [PATCH 3/4] gnu: Add wasm32-wasi-clang. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Apr 2025 19:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77653@debbugs.gnu.org Cc: Ian Eure Received: via spool by 77653-submit@debbugs.gnu.org id=B77653.17441423321382 (code B ref 77653); Tue, 08 Apr 2025 19:59:03 +0000 Received: (at 77653) by debbugs.gnu.org; 8 Apr 2025 19:58:52 +0000 Received: from localhost ([127.0.0.1]:35619 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2F5v-0000MC-RW for submit@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:52 -0400 Received: from fout-a4-smtp.messagingengine.com ([103.168.172.147]:60185) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2F5l-0000LC-KV for 77653@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:41 -0400 Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id 569381380194; Tue, 8 Apr 2025 15:58:36 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Tue, 08 Apr 2025 15:58:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1744142316; x= 1744228716; bh=CKE9h4Q974/sAw7NUwUqGQ4rKmHKHHsI63d2Osz6how=; b=g m/VOemtCH8AsGO3O1wuOAnAnBXLDGsyMDA0QzE5kbe2L0ijKlIdIF6aqQcwuJJoN wW4x6+OQxBl1PdXuTg2XJR9zmwc06M0MNGJdFnHpCwQrNzJKCM2eSBX1Gm8I4R0E 6pqhQY7+p4XofEp3CAHFvEKbWDX36QOEI0i1YyqPPSltezooqNvsQTItl/egJoC3 wLyp1O/4yXD4MSseB7eqsaZSIO9FYlu3TNrrWrHJlcRrJFOGrDOZhq56D+O5JyAF 3I+yrqJE9bizwr7d/2Zlbjyz9gIfRSX4UobAvgAVlfmIny9a3jXg4InUm5HbvS8t DLIAWefaeBsnp/2uW6dew== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1744142316; x=1744228716; bh=C KE9h4Q974/sAw7NUwUqGQ4rKmHKHHsI63d2Osz6how=; b=sJlgz1mB/yxxZ2wGT LL8GoELDrWbeeuGPbdbPBVm7CyGFdxTUxeQq+QBIvkq0BYBIxj7P6+Yhf6tCJ6kR LstVIDsMMpARR+ADhtb3+n0iZDtcF9AQnqLagOh41JeVdWk8Nptl2f5He7yi+Cnf CQrk1knQLMUoR5+lWJRuA8LVeZe0wNz1hpR/D3/XaxSIT2RgGc14NeTzF5RgoGIh 9dHAMT4BQujcveIUekgNdpJn7lnN5DC+5sPXCXwS02sgKzalOxBatyp8G5ZPrF5t wVZvSUKfzYfBP76KdC9M8VLW8uTOyt4TxAMGsCoT3n4pDQFxe4L0JlGOJdWbLi2s b+qqQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtdefleelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepveevjeffuddvte eiueetgfeukedvfeeiuedvveelfeeghfduleeftedvgfefgeejnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtg drthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peejjeeiheefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrh gvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 8 Apr 2025 15:58:35 -0400 (EDT) From: Ian Eure Date: Tue, 8 Apr 2025 12:58:28 -0700 Message-ID: <20250408195830.2084-3-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408195830.2084-1-ian@retrospec.tv> References: <20250408195830.2084-1-ian@retrospec.tv> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/wasm.scm (wasm32-wasi-clang): New variable. Change-Id: Ibf1df3e93929442a8eed29eea20b2f83b491f3b3 --- gnu/packages/wasm.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/gnu/packages/wasm.scm b/gnu/packages/wasm.scm index 53ea31f4a7..447687d009 100644 --- a/gnu/packages/wasm.scm +++ b/gnu/packages/wasm.scm @@ -24,7 +24,8 @@ (define-module (gnu packages wasm) #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) + #:use-module (guix packages) + #:use-module (guix utils)) (define-public wasi-libc (package @@ -106,3 +107,29 @@ (define-public wasm32-wasi-clang-runtime ;; WASM only needs libclang_rt.builtins-wasm32.a from ;; compiler-rt. "../source/compiler-rt/lib/builtins"))))) + +;; Although Clang can be built to support multiple compilation targets, Guix +;; builds only target the native architecture, so we have to build a build a +;; new toolchain that to target WASM. + +(define clang-from-llvm (@@ (gnu packages llvm) clang-from-llvm)) +(define llvm-monorepo (@@ (gnu packages llvm) llvm-monorepo)) + +(define-public wasm32-wasi-clang + (let ((base (clang-from-llvm llvm-16 wasm32-wasi-clang-runtime))) + (package (inherit base) + (name "wasm32-wasi-clang") + (inputs + (modify-inputs (package-inputs base) + (prepend wasi-libc))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags) + #~(list "-DCLANG_INCLUDE_TESTS=True" + ;; Use a sane default include directory. + (string-append "-DC_INCLUDE_DIRS=" + #$wasi-libc + "/wasm32-wasi/include"))) + ((#:phases phases) + `(modify-phases ,phases + (delete 'symlink-cfi_ignorelist)))))))) From patchwork Tue Apr 8 19:58:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Eure X-Patchwork-Id: 41463 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CBCAA27BC4B; Tue, 8 Apr 2025 20:59:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 01B4227BC4A for ; Tue, 8 Apr 2025 20:59:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2F6C-0007Je-Cd; Tue, 08 Apr 2025 15:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u2F68-0007Ew-RJ for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2F68-0003S9-BA for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=axPxyrcA3IFm2qsUi1txOzWzKJGTYicABlSjwl9psfk=; b=pcIxx+Xsm8X6Zmgum7sny8XbCuKt3fzNRyazoJXwfL2p4y6BCnAP80tlvFTY8g24gX59KS2qjr8dsqHbYKufThtE0o2vtBsP+HcOy7Z6A8XNSN3mexZGFG1IiyvESSivIWqD1KeR82SVDn7sKID3NKn8DzWZ/aam7sys/UIR0+OMXx2TP/8DL/ayDyCV0uFS90OIuYtvMqkh75Wd2ou+tHxE6See/jUUftues0GcxlZO0Bbmajh1zplvsKV3lt/TDDY64WgTk6Q5wsdXp+TlOZ0JTZ0v63Id6AGrk309UnK4L6Q5QiYSs4mF14ZGc+hfkUzshFOYF2uAJKFRr3BRFQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2F68-0000NF-4b for guix-patches@gnu.org; Tue, 08 Apr 2025 15:59:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77653] [PATCH 4/4] gnu: Add wasm-sandboxed. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Apr 2025 19:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77653 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77653@debbugs.gnu.org Cc: Ian Eure Received: via spool by 77653-submit@debbugs.gnu.org id=B77653.17441423321390 (code B ref 77653); Tue, 08 Apr 2025 19:59:04 +0000 Received: (at 77653) by debbugs.gnu.org; 8 Apr 2025 19:58:52 +0000 Received: from localhost ([127.0.0.1]:35621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2F5w-0000ME-7d for submit@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:52 -0400 Received: from fout-a4-smtp.messagingengine.com ([103.168.172.147]:42867) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2F5m-0000LE-Ep for 77653@debbugs.gnu.org; Tue, 08 Apr 2025 15:58:42 -0400 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 348D4138016D; Tue, 8 Apr 2025 15:58:37 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Tue, 08 Apr 2025 15:58:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1744142317; x= 1744228717; bh=axPxyrcA3IFm2qsUi1txOzWzKJGTYicABlSjwl9psfk=; b=P m66cwuk6efvD/19OdfKprayNgmJVvQ/L81WfFOl6hKbJuZOo0SAW2jJb8pFaP9W0 jnsgMFtCLFQ1tWM3nmb8Jq4SJv1kmTZ+7+70T6eKdxy4+XNiFcyPK4+DChSM2gVD Ruvn5MUNB+sWJcpmKVdytUVtDVg2caOwIdRms3RtaH18WV6uvoKQxnnsrX3ov8UT Z8MVTFtphh8qHbqBI8FMGxy3G2xKBtEFdIqEDx6adG9s1hb+KW//0fuzy9Uj4YUa k49geWEWMaAccgRPg4vYhKxH5s9+cCQhdBoAjojzHP5TYyMLe4NMYmE9ejVOg+Zr ghgonkZR+QqgNJh2HIAxg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1744142317; x=1744228717; bh=a xPxyrcA3IFm2qsUi1txOzWzKJGTYicABlSjwl9psfk=; b=O/7bQh7Anx35n3or+ 3TqimCaq0KfamSsa5KDKPpTaPSQ65LkJs/2qO6eOAavpSyZQlXaUCO+dwdupHnQQ wF78MewHzdUthtY6S1N3QLJxImvTaquW7Q9a4vig72K9yW0Yx1f4EUepqvOl1vqZ pL5UMKap155cEO6IRxzpVI/bBB9np/LWdzQwNdTrmC5Ohum141XOaYFa+5tyPD6X ykohCjRpVebKJTF4FcJORSWNrrooZTB/yBjghAuJeeAjrox5XjrcQzvpAsgn2/6P aWP82jXgDjFhvn6EfWXHABbLKGlDr47Pp4a1kS5J6YdTV8wqHFvK1j/rDLoYd/Z9 rhq+Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtdefleelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf evufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefkrghnucfguhhrvgcuoehi rghnsehrvghtrhhoshhpvggtrdhtvheqnecuggftrfgrthhtvghrnhepveevjeffuddvte eiueetgfeukedvfeeiuedvveelfeeghfduleeftedvgfefgeejnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsphgvtg drthhvpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtthho peejjeeiheefseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepihgrnhesrh gvthhrohhsphgvtgdrthhv X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 8 Apr 2025 15:58:36 -0400 (EDT) From: Ian Eure Date: Tue, 8 Apr 2025 12:58:29 -0700 Message-ID: <20250408195830.2084-4-ian@retrospec.tv> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408195830.2084-1-ian@retrospec.tv> References: <20250408195830.2084-1-ian@retrospec.tv> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gnuzilla.scm (wasm-sandboxed): New variable. Change-Id: I568e6cb9aca43122a06f46fd3a8d9a462754c36a --- gnu/packages/gnuzilla.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index f4a912d8d5..32b2d13de5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -99,8 +99,38 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline) #:use-module (gnu packages sqlite) + #:use-module (gnu packages wasm) #:autoload (json parser) (json->scm)) +(define-public (wasm-sandboxed orig-package) + "Given a Firefox or Firefox-derived package ORIG-PACKAGE, return a +variant package which enables WASM sandboxing." + (package + (inherit orig-package) + (name (string-append (package-name orig-package) "-wasm-sandboxed")) + (arguments + (substitute-keyword-arguments (package-arguments orig-package) + ((#:configure-flags flags) + #~(let ((wasi-sysroot #$(this-package-native-input "wasm32-wasi-clang-toolchain"))) + (append (delq "--without-wasm-sandboxed-libraries" #$flags) + (list + (string-append "--with-wasi-sysroot=" wasi-sysroot "/wasm32-wasi"))))) + ((#:phases phases) + #~(modify-phases #$phases + (add-before 'configure 'set-wasm-env + (lambda* (#:key inputs #:allow-other-keys) + (setenv "WASM_CC" + (string-append (assoc-ref inputs + "wasm32-wasi-clang-toolchain") + "/bin/clang")) + (setenv "WASM_CXX" + (string-append (assoc-ref inputs + "wasm32-wasi-clang-toolchain") + "/bin/clang++")))))))) + (native-inputs + (modify-inputs (package-native-inputs orig-package) + (append wasm32-wasi-clang-toolchain))))) + (define-public mozjs (package (name "mozjs")