diff --git a/www/wabt/Makefile b/www/wabt/Makefile index 1fbf2aa43870..f585f7342da7 100644 --- a/www/wabt/Makefile +++ b/www/wabt/Makefile @@ -1,37 +1,39 @@ PORTNAME= wabt -DISTVERSION= 1.0.30 +DISTVERSION= 1.0.32 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org COMMENT= WebAssembly Binary Toolkit 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 CMAKE_TESTING_ON= BUILD_TESTS CMAKE_TESTING_TARGET= ${ALL_TARGET} OPTIONS_DEFINE= FUZZ_TOOLS 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 .include 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,29 +1,29 @@ ---- 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}) -add_library(wabt STATIC ${WABT_LIBRARY_SRC}) +add_library(wabt ${WABT_LIBRARY_SRC}) 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") - add_library(wabt-fuzz STATIC ${WABT_LIBRARY_SRC}) + add_library(wabt-fuzz ${WABT_LIBRARY_SRC}) set_target_properties(wabt-fuzz PROPERTIES COMPILE_FLAGS "${FUZZ_FLAGS}" 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 @@ -1,99 +1,99 @@ bin/spectest-interp bin/wasm-decompile bin/wasm-interp bin/wasm-objdump bin/wasm-opcodecnt bin/wasm-strip bin/wasm-validate bin/wasm2c bin/wasm2wat %%FUZZ_TOOLS%%bin/wasm2wat-fuzz bin/wast2json bin/wat-desugar bin/wat2wasm include/wabt/apply-names.h include/wabt/base-types.h include/wabt/binary-reader-ir.h include/wabt/binary-reader-logging.h include/wabt/binary-reader-nop.h include/wabt/binary-reader-objdump.h include/wabt/binary-reader-opcnt.h include/wabt/binary-reader.h include/wabt/binary-writer-spec.h include/wabt/binary-writer.h include/wabt/binary.h include/wabt/binding-hash.h include/wabt/c-writer.h include/wabt/cast.h include/wabt/circular-array.h include/wabt/color.h include/wabt/common.h include/wabt/config.h include/wabt/decompiler-ast.h include/wabt/decompiler-ls.h include/wabt/decompiler-naming.h include/wabt/decompiler.h include/wabt/error-formatter.h include/wabt/error.h include/wabt/expr-visitor.h include/wabt/feature.def include/wabt/feature.h include/wabt/filenames.h include/wabt/generate-names.h include/wabt/interp/binary-reader-interp.h include/wabt/interp/interp-inl.h include/wabt/interp/interp-math.h 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 include/wabt/leb128.h include/wabt/lexer-source-line-finder.h include/wabt/lexer-source.h include/wabt/literal.h include/wabt/make-unique.h include/wabt/opcode-code-table.h include/wabt/opcode.def include/wabt/opcode.h include/wabt/option-parser.h include/wabt/range.h include/wabt/resolve-names.h include/wabt/result.h include/wabt/shared-validator.h include/wabt/stream.h include/wabt/string-format.h include/wabt/string-util.h include/wabt/token.def include/wabt/token.h include/wabt/tracing.h include/wabt/type-checker.h include/wabt/type.h include/wabt/utf8.h 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 lib/cmake/wabt/wabt-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/wabt/wabt-targets.cmake lib/libwabt.so lib/libwasm-rt-impl.so share/man/man1/spectest-interp.1.gz share/man/man1/wasm-decompile.1.gz share/man/man1/wasm-interp.1.gz share/man/man1/wasm-objdump.1.gz share/man/man1/wasm-opcodecnt.1.gz share/man/man1/wasm-strip.1.gz share/man/man1/wasm-validate.1.gz share/man/man1/wasm2c.1.gz 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