diff --git a/www/wabt/Makefile b/www/wabt/Makefile index d4e04356a0b1..7a6053587fe9 100644 --- a/www/wabt/Makefile +++ b/www/wabt/Makefile @@ -1,42 +1,42 @@ PORTNAME= wabt -DISTVERSION= 1.0.34 +DISTVERSION= 1.0.35 CATEGORIES= www MAINTAINER= yuri@FreeBSD.org COMMENT= WebAssembly Binary Toolkit WWW= https://github.com/WebAssembly/wabt LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_FreeBSD_15_amd64= clang-17 fails to build wabt: undefined symbol: __elf_aux_vector, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277983 TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing localbase:ldflags python ssl USE_GITHUB= yes GH_ACCOUNT= WebAssembly GH_TUPLE= dabeaz:ply:d776a2e:dabeaz_ply/third_party/ply \ nodejs:uvwasi:55eff19:nodejs_uvwasi/third_party/uvwasi \ okdshin:PicoSHA2:27fcf69:picosha/third_party/picosha2 \ simd-everywhere:simde:54b8c8f:simde/third_party/simde \ - WebAssembly:testsuite:c2a67a5:WebAssembly_testsuite/third_party/testsuite \ + WebAssembly:testsuite:0a394e3:WebAssembly_testsuite/third_party/testsuite \ WebAssembly:wasm-c-api:b6dd1fb: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_DEFAULT_amd64= FUZZ_TOOLS # only enable on architectures where /usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-{arch}.a is installed OPTIONS_SUB= yes FUZZ_TOOLS_DESC= Build tools that can repro fuzz bugs FUZZ_TOOLS_CMAKE_BOOL= BUILD_FUZZ_TOOLS post-test: @cd ${TEST_WRKSRC} && ./wabt-unittests .include diff --git a/www/wabt/distinfo b/www/wabt/distinfo index 235469c8c1c8..11a8f4c528bb 100644 --- a/www/wabt/distinfo +++ b/www/wabt/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1703640020 -SHA256 (WebAssembly-wabt-1.0.34_GH0.tar.gz) = 0d7da8a066141d4a21102c42fd6b059bfee7c03220c3efa9001bd781bf1f4330 -SIZE (WebAssembly-wabt-1.0.34_GH0.tar.gz) = 1226317 +TIMESTAMP = 1715761878 +SHA256 (WebAssembly-wabt-1.0.35_GH0.tar.gz) = c55bb2083de3afafa011ac1ab4aa14bab9fe51c2a90d24ba38f66f6b3bde0b09 +SIZE (WebAssembly-wabt-1.0.35_GH0.tar.gz) = 1242161 SHA256 (dabeaz-ply-d776a2e_GH0.tar.gz) = 36520ea1c1ead2139282096f6727fe0baf62a67950374f64ea4623955c45daac SIZE (dabeaz-ply-d776a2e_GH0.tar.gz) = 149787 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-54b8c8f_GH0.tar.gz) = 58a8bef5fae26922b245830ff85bac0627fe115c99c041436a53f6a20bdc662f SIZE (simd-everywhere-simde-54b8c8f_GH0.tar.gz) = 6138190 -SHA256 (WebAssembly-testsuite-c2a67a5_GH0.tar.gz) = 58b3904efeea597f9b7ea8475142fecf1a00127d9e22e5f0f86bb6f4ebe1f10b -SIZE (WebAssembly-testsuite-c2a67a5_GH0.tar.gz) = 624991 +SHA256 (WebAssembly-testsuite-0a394e3_GH0.tar.gz) = aa1f3d57a35ab0346fdfebea37f4c896a525e9465eef32b71550bf4e9dfa7b3d +SIZE (WebAssembly-testsuite-0a394e3_GH0.tar.gz) = 629310 SHA256 (WebAssembly-wasm-c-api-b6dd1fb_GH0.tar.gz) = 19e41111cb2cb83bfa06ded6b1a16c81475248e0b293a98dd2c50e82d48d680c SIZE (WebAssembly-wasm-c-api-b6dd1fb_GH0.tar.gz) = 57094 diff --git a/www/wabt/files/patch-CMakeLists.txt b/www/wabt/files/patch-CMakeLists.txt index 9bc598736a93..cc3e0ada75b3 100644 --- a/www/wabt/files/patch-CMakeLists.txt +++ b/www/wabt/files/patch-CMakeLists.txt @@ -1,29 +1,29 @@ ---- CMakeLists.txt.orig 2023-10-25 02:14:59 UTC +--- CMakeLists.txt.orig 2024-05-14 22:23:51 UTC +++ CMakeLists.txt @@ -391,7 +391,7 @@ set(WABT_LIBRARY_SRC ${WABT_LIBRARY_CC} ${WABT_LIBRARY set(WABT_LIBRARY_SRC ${WABT_LIBRARY_CC} ${WABT_LIBRARY_H}) -add_library(wabt STATIC ${WABT_LIBRARY_SRC}) +add_library(wabt ${WABT_LIBRARY_SRC}) add_dependencies(wabt gen-wasm2c-prebuilt-target) add_library(wabt::wabt ALIAS wabt) @@ -425,7 +425,7 @@ if (HAVE_SETJMP_H) if (HAVE_SETJMP_H) - set(WASM_RT_FILES "wasm2c/wasm-rt-impl.h" "wasm2c/wasm-rt-impl.c" "wasm2c/wasm-rt-exceptions-impl.c") + set(WASM_RT_FILES "wasm2c/wasm-rt-impl.h" "wasm2c/wasm-rt-impl.c" "wasm2c/wasm-rt-exceptions-impl.c" "wasm2c/wasm-rt-mem-impl.c") - add_library(wasm-rt-impl STATIC ${WASM_RT_FILES}) + add_library(wasm-rt-impl ${WASM_RT_FILES}) + target_link_libraries(wasm-rt-impl ${CMAKE_THREAD_LIBS_INIT}) 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) -@@ -453,7 +453,7 @@ if (BUILD_FUZZ_TOOLS) +@@ -454,7 +454,7 @@ if (BUILD_FUZZ_TOOLS) 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}) target_link_libraries(wabt-fuzz PUBLIC wabt) set_target_properties(wabt-fuzz PROPERTIES diff --git a/www/wabt/pkg-plist b/www/wabt/pkg-plist index 3c5129457d8e..498245a06a52 100644 --- a/www/wabt/pkg-plist +++ b/www/wabt/pkg-plist @@ -1,100 +1,101 @@ bin/spectest-interp bin/wasm-decompile bin/wasm-interp bin/wasm-objdump bin/wasm-stats 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-stats.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/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/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/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/sha256.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-exceptions.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-stats.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-exceptions-impl.c %%DATADIR%%/wasm2c/wasm-rt-impl.c %%DATADIR%%/wasm2c/wasm-rt-impl.h +%%DATADIR%%/wasm2c/wasm-rt-mem-impl.c