From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id mOA7Nw+dLGRMWgAASxT56A (envelope-from ) for ; Tue, 04 Apr 2023 23:56:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eP4pNw+dLGSBFgAA9RJhRA (envelope-from ) for ; Tue, 04 Apr 2023 23:56:31 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 89F1E75BC for ; Tue, 4 Apr 2023 23:56:30 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pjodU-00041S-1w; Tue, 04 Apr 2023 17:56:16 -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 1pjndK-00025G-H0 for guix-patches@gnu.org; Tue, 04 Apr 2023 16:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pjndK-0004hG-8j for guix-patches@gnu.org; Tue, 04 Apr 2023 16:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pjndJ-00088f-SC for guix-patches@gnu.org; Tue, 04 Apr 2023 16:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62669] [PATCH] gnu: wabt: Update to 1.0.32 Resent-From: Robin Templeton Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Apr 2023 20:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62669@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168064149431248 (code B ref -1); Tue, 04 Apr 2023 20:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Apr 2023 20:51:34 +0000 Received: from localhost ([127.0.0.1]:50375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pjnco-00087o-C8 for submit@debbugs.gnu.org; Tue, 04 Apr 2023 16:51:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:42812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pjnQ0-0007di-1u for submit@debbugs.gnu.org; Tue, 04 Apr 2023 16:38:16 -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 1pjnPz-0007Z2-QF for guix-patches@gnu.org; Tue, 04 Apr 2023 16:38:15 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pjnPx-00070T-I6 for guix-patches@gnu.org; Tue, 04 Apr 2023 16:38:15 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 3348E5C01E6 for ; Tue, 4 Apr 2023 16:38:11 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 04 Apr 2023 16:38:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= spritely.institute; h=cc:content-transfer-encoding:content-type :content-type:date:date:from:from:in-reply-to:message-id :mime-version:reply-to:sender:subject:subject:to:to; s=fm2; t= 1680640691; x=1680727091; bh=aIxMSF+8WR7C7CULAIfflFm5pPVQs7gm7/Z 7oJIeaG8=; b=m7rfNx00Qz/of+4vbcMSN7VdNnIs61PyMsmRnDVSqlR5B7zo8aM tsaU5JtPCzFsyoFG7408zPvy89SeFG/i4XtOwyBr5SB0LYLarXfEm4TEdwbxv04K D71xfEJ6hYVI5pRuF3cjt1dgsfEEzwUxZILUOMV1fhi3W7v8mG+CymwjILPRt1CJ dk0WN0XBCddUoQcdMKPt+L4gh+ZwAbNvYAoKr8JROp0f+aHm2CA6LrV3PKzNMayy IGCE5UncgvB8v7M3VfSDaljVjgGRZZScT6xO8n2uU3yr5SW3pC+JmawWp1xU060Q iIc1k3eNnjZetWtJ+uOY1cW6I7pV0iy/EVg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=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:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1680640691; x=1680727091; bh=aIxMSF+8WR7C7 CULAIfflFm5pPVQs7gm7/Z7oJIeaG8=; b=S/Sl+HxHMG1uNNbpD+6iFF0qWuaSb GHyLgFX4rnbgnNXQuY9yeU8pzYFKZHDbF0JfMNOqjsGdseIDyrJ3Pk5AMiDRLBVv IuXgfL+/qsqA0e1nXotDXOHtJcrcUUBHk2iP+76vxsgWBDmaZ3xpzVtHcgXKI9s1 +biYB2HVHzRUWiv/S4Vo4z96A2TCw4LzyI+FOfU/+P54ltzYslM2T/WvLq/QZM6K 8O8DyfTkQSxziOxCC9KTbpLhVSXWg3g4hN39hOvSwhTEgfRGC3D4klLM9y0N+eyo RRfZKzVP7Wy5sCrmAKWGKk2MmDAUGQ8vIkGpDLCWrtYE53YbcONQ9sZvA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeiledgudehvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkfgfgggtgfesthhqre dttderjeenucfhrhhomheptfhosghinhcuvfgvmhhplhgvthhonhcuoehrohgsihhnsehs phhrihhtvghlhidrihhnshhtihhtuhhtvgeqnecuggftrfgrthhtvghrnhepgeekjeevie eltdfhieeflefffeekhffhudehudeuleetteffjeeivdetfedttdfgnecuffhomhgrihhn pehgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmh grihhlfhhrohhmpehrohgsihhnsehsphhrihhtvghlhidrihhnshhtihhtuhhtvg X-ME-Proxy: Feedback-ID: i8ed14642:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 4 Apr 2023 16:38:10 -0400 (EDT) From: Robin Templeton Date: Tue, 04 Apr 2023 16:37:52 -0400 Message-ID: <87fs9fe63j.fsf@spritely.institute> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=66.111.4.26; envelope-from=robin@spritely.institute; helo=out2-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 04 Apr 2023 16:51:28 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Tue, 04 Apr 2023 17:56:13 -0400 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1680645391; a=rsa-sha256; cv=none; b=PfnpKIo4SKwx5N6uJeobMQfZKC2gV+815+DoRpzbD8UI5aVBUxuqg/McipVw8g2OVobscF Agvt9yk2HpNCE2JvsxXKFhl5mTrjDoLtb0BgJ6OmtIGQ/b4pqtnb2ovN/FKQXR6bXRvVna QK+RNejLsrpoTBH/r54QQ+Grfw+bZv0S+DRykhjd6yJQIp/sWDhvVx5pWQtuqgzpvYoVYl SbuG19UmZMQBftRjG4j22WQgNylgmhkxCLP5mq5S6KCzexwXsmUSfGPpyNKGQaatLX4Ajv 1fyS8dh1TB+GfjE5wRSkITR4sSFEN6/6zO5xcHLEwDhMN7OQfvMJpSQiyLWFnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spritely.institute header.s=fm2 header.b=m7rfNx00; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="S/Sl+HxH"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1680645391; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=aIxMSF+8WR7C7CULAIfflFm5pPVQs7gm7/Z7oJIeaG8=; b=jIWXvMM92rXlaxW45xClmaadKzAJ0nmxyDSmLyA2cyyMufyxN0msGLMAKrncJ4r+on2hu0 OOZdoGjVKq1j0hQcNWWMVBSSstC6qVQ00YQE02KPtCAc/bmjkK/9F8ddwfZVCeLeQDfpXz 4kg4DKaK1/lJC3z5NCA/sxI928ZcIuoofPtcTP3XEc4zQBFqWSMCIg02Ej9W3TGphExIh4 Hlc1TUT61DCFun6mSDrCKfkEh86mzdTXBJOOjAcCnJoUPZoTe+RCE3Jxxe1PD2dvgJJPET pWd0euxpcGWN5NrcjDp05S1SDDax2afKqn7oOuve9WZ0WmpJl1VYVxM5keufVA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spritely.institute header.s=fm2 header.b=m7rfNx00; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b="S/Sl+HxH"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: -2.32 X-Spam-Score: -2.32 X-Migadu-Queue-Id: 89F1E75BC X-TUID: nVAH1iOqWGcX * gnu/packages/web.scm (wabt): Update to 1.0.32. Enable test suite. --- gnu/packages/web.scm | 57 +++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 19 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 90337b8dd8..fdbc17d264 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -62,6 +62,7 @@ ;;; Copyright =C2=A9 2023 Paul A. Patience ;;; Copyright =C2=A9 2022 Bruno Victal ;;; Copyright =C2=A9 2023 David Thompson +;;; Copyright =C2=A9 2023 Robin Templeton ;;; ;;; This file is part of GNU Guix. ;;; @@ -157,6 +158,7 @@ (define-module (gnu packages web) #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) + #:use-module (gnu packages llvm) #:use-module (gnu packages lsof) #:use-module (gnu packages lua) #:use-module (gnu packages mail) @@ -1518,41 +1520,58 @@ (define-public libwebsockets (define-public wabt (package (name "wabt") - (version "1.0.12") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/WebAssembly/wabt") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1zlv3740wkqj4mn6sr84h0x6wk2lcp4pwwmqsh5yyqp1j1glbsa0")))) + (version "1.0.32") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WebAssembly/wabt") + (commit version) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m124r8v9c0hxiaa4iy7ch4ng8msnirbc2vb702gbdjhvgzyrcwh")))) (build-system cmake-build-system) (arguments - `(#:configure-flags '("-DBUILD_TESTS=3DOFF") - #:tests? #f)) - (inputs `(("python" ,python-2) - ("re2c" ,re2c))) + (list #:out-of-source? #t + #:test-target "check" + #:phases #~(modify-phases %standard-phases + ;; The wasm2c tests (e.g., "memory-init.txt") comp= ile + ;; successfully with clang but not gcc. + (add-before 'check 'set-cc + (lambda _ + (setenv "CC" "clang")))))) + (native-inputs (list python clang)) (home-page "https://github.com/WebAssembly/wabt") (synopsis "WebAssembly Binary Toolkit") - (description "WABT (pronounced: wabbit) is a suite of tools for -WebAssembly, including: + (description + "WABT (pronounced: wabbit) is a suite of tools for WebAssembly, +including: =20 @enumerate -@item @command{wat2wasm} translates from WebAssembly text format to the +@item @command{wat2wasm} translates from WebAssembly text format (WAT) to = the WebAssembly binary format @item @command{wasm2wat} is the inverse; it translates from the binary for= mat -back to the text format (also known as a .wat) +back to WAT @item @command{wasm-objdump} prints information about a wasm binary, simil= arly to @command{objdump}. @item @command{wasm-interp} decodes ands run a WebAssembly binary file usi= ng a stack-based interpreter -@item @command{wat-desugar} parses .wat text form as supported by the spec +@item @command{wasm-decompile} decompiles a wasm binary into a readable +C-like syntax +@item @command{wat-desugar} parses WAT text form as supported by the spec interpreter (s-expressions, flat syntax, or mixed) and prints the canonical flat format @item @command{wasm2c} converts a WebAssembly binary file to a C source and header file. +@item @command{wasm-strip} removes sections of a WebAssembly binary file +@item @command{wasm-validate} validates a file in the WebAssembly binary +format +@item @command{wast2json} converts a file in the WebAssembly spec test +format to a JSON file and associated wasm binary file +@item @command{wasm-opcodecnt} counts opcode usage for instructions +@item @command{spectest-interp} reads a spectest JSON file and runs its +test in the interpreter @end enumerate =20 These tools are intended for use in (or for development of) toolchains or --=20 2.39.1