From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id cIsWB0REL2QI6wAASxT56A (envelope-from ) for ; Fri, 07 Apr 2023 00:14:28 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WF3LBkREL2RFigAAauVa8A (envelope-from ) for ; Fri, 07 Apr 2023 00:14:28 +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 D69F54508B for ; Fri, 7 Apr 2023 00:14:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkXro-0004W6-PD; Thu, 06 Apr 2023 18:14:04 -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 1pkXrn-0004Vr-9B for guix-patches@gnu.org; Thu, 06 Apr 2023 18:14:03 -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 1pkXrn-0006s4-0Q for guix-patches@gnu.org; Thu, 06 Apr 2023 18:14:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pkXrm-0000wM-EZ for guix-patches@gnu.org; Thu, 06 Apr 2023 18:14:02 -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: Thu, 06 Apr 2023 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62669 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Robin Templeton Cc: 62669@debbugs.gnu.org Received: via spool by 62669-submit@debbugs.gnu.org id=B62669.16808192023545 (code B ref 62669); Thu, 06 Apr 2023 22:14:02 +0000 Received: (at 62669) by debbugs.gnu.org; 6 Apr 2023 22:13:22 +0000 Received: from localhost ([127.0.0.1]:55357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pkXr7-0000v7-Oq for submit@debbugs.gnu.org; Thu, 06 Apr 2023 18:13:22 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:57204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pkXr5-0000uu-Ey for 62669@debbugs.gnu.org; Thu, 06 Apr 2023 18:13:20 -0400 Received: from [2603:6081:2241:752:71c3:6c06:a290:62ae] (helo=cervus) by minsky.hcoop.net with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pkXqz-0008Fi-DE; Thu, 06 Apr 2023 18:13:13 -0400 From: Robin Templeton References: <87fs9fe63j.fsf@spritely.institute> Date: Thu, 06 Apr 2023 18:13:10 -0400 In-Reply-To: <87fs9fe63j.fsf@spritely.institute> (Robin Templeton's message of "Tue, 04 Apr 2023 16:37:52 -0400") Message-ID: <87a5zk8xs9.fsf@terpri.org> 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 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+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=1680819267; a=rsa-sha256; cv=none; b=AFGuvLh/0ykiz7SG/r9swxLkLNkOwuVMplsMtldrVDnPH4mzHvr3xQ+L41G3K2xUTQ/tz7 O4Zm/ckHpVAXgiAbhN+TUK8EY8OZEhSk1pyPjwyV0qgjpcei6Hf48wN1Pefb2DIrmcmokc s3s7BDesSsZCKn9THQD6FHHAMGk91Q+MhC0lHhzM2kXhprslv4oSTmscstGVaq6BsVN1KT mB8N+vDCQLoqyxqdPwiHTOfGLoRPwWykVz80O5inMQobNe820jvuPNZJAPSkJRjo0az8WN iSut+CC87OUS9Fw0vjsehbrhmliSsOYaXTDlYNX5XFO8gyQrFrKYG8tvzzsyNQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; 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=1680819267; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=0CxU/1pgJ9nIedZ1Bl5Xh3mUvJKyg0812vJEs6gizSw=; b=dKON3ARXpIq7NXTs3eesL9rJq6r7YYh7dxS4G8oYXpQt3L5BExu1DzANnFrS7xa/Lid1Yb EpoJyJgQq4Vs/Cs00YXUXgln8mNZ5AynZadDeeB6dqc5vXX9LhKFdkDUBvWMKY3IF/hbbh Wn7PmXeyqtmsZsmEKUp7nPkVR4JtX4rAVHG/xOnS2ytKoqb2bj1136cQ8RLrslYFZc5bzg dTncgUYKcl1Wb8Jy0BbZ8uGNtAz0Yj9VE99ZIhrznvVswsXMjjI7Oj9TXxYnhhny6NawzU rRLMgYmF04zgGksJrsqzAzNWHIJbm3V2QTv7i4WBwfWoYqLEYEe76rTqsdhAdA== X-Migadu-Spam-Score: -3.22 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; 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-Spam-Score: -3.22 X-Migadu-Queue-Id: D69F54508B X-TUID: FqJ8XGtvGfwh * gnu/packages/web.scm (wabt): Update to 1.0.32. Enable test suite. --- wabt apparently only works on amd64; add a supported-systems field to reflect that. (Thanks to David Thompson for reporting this problem.) gnu/packages/web.scm | 58 +++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7b05a99752..ad2e3e0850 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,45 +1520,63 @@ (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 other systems that want to manipulate WebAssembly files.") + (supported-systems '("x86_64-linux")) (license license:asl2.0))) =20 (define-public wasm3 base-commit: 47ea688fd27d0ce0c8ea5481f1f94d0ebc3e37eb --=20 2.39.1