git: 7a27125e03da - main - www/wabt: Update 1.0.30 → 1.0.32

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 28 Feb 2023 03:23:18 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7a27125e03dae1e58bba884d55ef49005ef20766

commit 7a27125e03dae1e58bba884d55ef49005ef20766
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-02-28 02:41:40 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-02-28 02:41:40 +0000

    www/wabt: Update 1.0.30 → 1.0.32
    
    Reported by:    portscout
---
 www/wabt/Makefile                   | 16 +++++++++-------
 www/wabt/distinfo                   | 28 +++++++++++++++++-----------
 www/wabt/files/patch-CMakeLists.txt | 20 ++++++++++----------
 www/wabt/pkg-plist                  |  4 ++--
 4 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/www/wabt/Makefile b/www/wabt/Makefile
index 1fbf2aa43870..f585f7342da7 100644
--- a/www/wabt/Makefile
+++ b/www/wabt/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wabt
-DISTVERSION=	1.0.30
+DISTVERSION=	1.0.32
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -9,16 +9,17 @@ WWW=		https://github.com/WebAssembly/wabt
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	googletest>0:devel/googletest
-
 USES=		cmake:testing localbase:ldflags python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	WebAssembly
-GH_TUPLE=	WebAssembly:testsuite:4f77306bb63151631d84f58dedf67958eb9911b9:WebAssembly_testsuite/third_party/testsuite \
-		dabeaz:ply:d776a2ece6c12bf8f8b6a0e65b48546ac6078765:dabeaz_ply/third_party/ply \
-		WebAssembly:wasm-c-api:d9a80099d496b5cdba6f3fe8fc77586e0e505ddc:WebAssembly_wasm_c_api/third_party/wasm-c-api \
-		nodejs:uvwasi:55eff19f4c7e69ec151424a037f951e0ad006ed6:nodejs_uvwasi/third_party/uvwasi
+GH_TUPLE=	dabeaz:ply:d776a2e:dabeaz_ply/third_party/ply \
+		google:googletest:703bd9c:googletest/third_party/gtest \
+		nodejs:uvwasi:55eff19:nodejs_uvwasi/third_party/uvwasi \
+		okdshin:PicoSHA2:27fcf69:picosha/third_party/picosha2 \
+		simd-everywhere:simde:97315b8:simde/third_party/simde \
+		WebAssembly:testsuite:3a04b2c:WebAssembly_testsuite/third_party/testsuite \
+		WebAssembly:wasm-c-api:d9a8009:WebAssembly_wasm_c_api/third_party/wasm-c-api
 
 CMAKE_ON=	BUILD_SHARED_LIBS USE_SYSTEM_GTEST
 CMAKE_OFF=	BUILD_TESTS
@@ -30,6 +31,7 @@ OPTIONS_SUB=		yes
 
 FUZZ_TOOLS_DESC=	Build tools that can repro fuzz bugs
 FUZZ_TOOLS_CMAKE_BOOL=	BUILD_FUZZ_TOOLS
+FUZZ_TOOLS_BROKEN=	fail to compile, see https://github.com/WebAssembly/wabt/issues/2153
 
 post-test:
 	@cd ${TEST_WRKSRC} && ./wabt-unittests
diff --git a/www/wabt/distinfo b/www/wabt/distinfo
index c0dfb6fb6fd5..8e7f37062cd3 100644
--- a/www/wabt/distinfo
+++ b/www/wabt/distinfo
@@ -1,11 +1,17 @@
-TIMESTAMP = 1664983116
-SHA256 (WebAssembly-wabt-1.0.30_GH0.tar.gz) = 27891167abad1e35e180dc1cfbc33dbc345a25bccf44218a902e12bc03e605a0
-SIZE (WebAssembly-wabt-1.0.30_GH0.tar.gz) = 1175828
-SHA256 (WebAssembly-testsuite-4f77306bb63151631d84f58dedf67958eb9911b9_GH0.tar.gz) = 9afc0e7c250b5f0dcf32e9a95860b99a392ab78a653fcf3705778e8a9357f3c4
-SIZE (WebAssembly-testsuite-4f77306bb63151631d84f58dedf67958eb9911b9_GH0.tar.gz) = 601571
-SHA256 (dabeaz-ply-d776a2ece6c12bf8f8b6a0e65b48546ac6078765_GH0.tar.gz) = d9c0be0a3bd2ac09f81700bc808526f91e6e80d87ff619a8cab47c9417c4180d
-SIZE (dabeaz-ply-d776a2ece6c12bf8f8b6a0e65b48546ac6078765_GH0.tar.gz) = 149974
-SHA256 (WebAssembly-wasm-c-api-d9a80099d496b5cdba6f3fe8fc77586e0e505ddc_GH0.tar.gz) = aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c
-SIZE (WebAssembly-wasm-c-api-d9a80099d496b5cdba6f3fe8fc77586e0e505ddc_GH0.tar.gz) = 56423
-SHA256 (nodejs-uvwasi-55eff19f4c7e69ec151424a037f951e0ad006ed6_GH0.tar.gz) = 34010745593cfb395fd483a0f65688dcd61e3f16de574edb5d43ea2cfbd57131
-SIZE (nodejs-uvwasi-55eff19f4c7e69ec151424a037f951e0ad006ed6_GH0.tar.gz) = 56469
+TIMESTAMP = 1677551657
+SHA256 (WebAssembly-wabt-1.0.32_GH0.tar.gz) = 984cd748c69953a6db60bf3c8faeecd628ccefb2051376f86b573ac3cb59b4bc
+SIZE (WebAssembly-wabt-1.0.32_GH0.tar.gz) = 1170512
+SHA256 (dabeaz-ply-d776a2e_GH0.tar.gz) = 36520ea1c1ead2139282096f6727fe0baf62a67950374f64ea4623955c45daac
+SIZE (dabeaz-ply-d776a2e_GH0.tar.gz) = 149787
+SHA256 (google-googletest-703bd9c_GH0.tar.gz) = 54bef85b53a02b21ed1e784848ea05cbfd78134f8976a7831a956cfebcef7204
+SIZE (google-googletest-703bd9c_GH0.tar.gz) = 904257
+SHA256 (nodejs-uvwasi-55eff19_GH0.tar.gz) = 4c1d796dde734cd596f571a8d193f60d164a79ec474ae933eac738b818c2b0c0
+SIZE (nodejs-uvwasi-55eff19_GH0.tar.gz) = 56399
+SHA256 (okdshin-PicoSHA2-27fcf69_GH0.tar.gz) = 9d4ed9a2c67c86d67c4f2c8cfde7f77120fb3e789194d53113d2f1d42b094717
+SIZE (okdshin-PicoSHA2-27fcf69_GH0.tar.gz) = 7620
+SHA256 (simd-everywhere-simde-97315b8_GH0.tar.gz) = 039b78c0e5b5cd85b48bec0854ba4b9ea0112cc831554cc662206489c6a2e07e
+SIZE (simd-everywhere-simde-97315b8_GH0.tar.gz) = 6028134
+SHA256 (WebAssembly-testsuite-3a04b2c_GH0.tar.gz) = 00e607c0392116563f941041a018401e37d1d6a1df33260026ecb6e6f68ac651
+SIZE (WebAssembly-testsuite-3a04b2c_GH0.tar.gz) = 604462
+SHA256 (WebAssembly-wasm-c-api-d9a8009_GH0.tar.gz) = e3aaaaffc4669303ef5ded6d820c7d9fa9845980fa06e3012a5a16eab331d7f9
+SIZE (WebAssembly-wasm-c-api-d9a8009_GH0.tar.gz) = 56426
diff --git a/www/wabt/files/patch-CMakeLists.txt b/www/wabt/files/patch-CMakeLists.txt
index ea17a1b17450..57dbf96bbb21 100644
--- a/www/wabt/files/patch-CMakeLists.txt
+++ b/www/wabt/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2022-09-30 21:24:30 UTC
+--- CMakeLists.txt.orig	2022-12-28 00:00:50 UTC
 +++ CMakeLists.txt
-@@ -333,7 +333,7 @@ set(WABT_LIBRARY_H
+@@ -358,7 +358,7 @@ set(WABT_LIBRARY_H
  
  set(WABT_LIBRARY_SRC ${WABT_LIBRARY_CC} ${WABT_LIBRARY_H})
  
@@ -9,16 +9,16 @@
  add_library(wabt::wabt ALIAS wabt)
  
  target_compile_features(wabt PUBLIC cxx_std_17)
-@@ -358,7 +358,7 @@ if (WABT_INSTALL_RULES)
+@@ -382,7 +382,7 @@ if (WABT_INSTALL_RULES)
+   )
  endif ()
  
- IF (NOT WIN32)
--  add_library(wasm-rt-impl STATIC wasm2c/wasm-rt-impl.c wasm2c/wasm-rt-impl.h)
-+  add_library(wasm-rt-impl wasm2c/wasm-rt-impl.c wasm2c/wasm-rt-impl.h)
-   add_library(wabt::wasm-rt-impl ALIAS wasm-rt-impl)
-   if (WABT_BIG_ENDIAN)
-     target_compile_definitions(wasm-rt-impl PUBLIC WABT_BIG_ENDIAN=1)
-@@ -381,7 +381,7 @@ endif ()
+-add_library(wasm-rt-impl STATIC wasm2c/wasm-rt-impl.c wasm2c/wasm-rt-impl.h)
++add_library(wasm-rt-impl wasm2c/wasm-rt-impl.c wasm2c/wasm-rt-impl.h)
+ add_library(wabt::wasm-rt-impl ALIAS wasm-rt-impl)
+ if (WABT_BIG_ENDIAN)
+   target_compile_definitions(wasm-rt-impl PUBLIC WABT_BIG_ENDIAN=1)
+@@ -409,7 +409,7 @@ endif ()
  
  if (BUILD_FUZZ_TOOLS)
    set(FUZZ_FLAGS "-fsanitize=fuzzer,address")
diff --git a/www/wabt/pkg-plist b/www/wabt/pkg-plist
index af165b88f6c2..9c2355c90ea1 100644
--- a/www/wabt/pkg-plist
+++ b/www/wabt/pkg-plist
@@ -47,7 +47,6 @@ include/wabt/interp/interp-util.h
 include/wabt/interp/interp-wasi.h
 include/wabt/interp/interp.h
 include/wabt/interp/istream.h
-include/wabt/interp/wasi_api.def
 include/wabt/intrusive-list.h
 include/wabt/ir-util.h
 include/wabt/ir.h
@@ -77,7 +76,6 @@ include/wabt/validator.h
 include/wabt/wast-lexer.h
 include/wabt/wast-parser.h
 include/wabt/wat-writer.h
-include/wasm-rt-impl.h
 include/wasm-rt.h
 lib/cmake/wabt/wabt-config-version.cmake
 lib/cmake/wabt/wabt-config.cmake
@@ -97,3 +95,5 @@ share/man/man1/wasm2wat.1.gz
 share/man/man1/wast2json.1.gz
 share/man/man1/wat-desugar.1.gz
 share/man/man1/wat2wasm.1.gz
+%%DATADIR%%/wasm2c/wasm-rt-impl.c
+%%DATADIR%%/wasm2c/wasm-rt-impl.h