diff --git a/lang/wasi-sdk/Portfile b/lang/wasi-sdk/Portfile index 4540eb1c760..1c6b33e686d 100644 --- a/lang/wasi-sdk/Portfile +++ b/lang/wasi-sdk/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup cmake 1.1 PortGroup github 1.0 -github.setup WebAssembly wasi-sdk 32 wasi-sdk- +github.setup WebAssembly wasi-sdk 33 wasi-sdk- github.tarball_from archive # GitHub archives extract as ${project}-${tag}/ when there are multiple distfiles worksrcdir ${github.project}-${github.tag_prefix}${github.version} @@ -54,9 +54,9 @@ if {${subport} ne ${name}} { # wasi-sdk source (primary distfile, needed by both subports) checksums ${distname}${extract.suffix} \ - rmd160 d60ca8427ef9c7036494df9c6a8d1afc3c262381 \ - sha256 b1fc272ae8856a943b85736bf36c2364dddf8fdf0e3de6c262ea3ad13dcbd0d6 \ - size 47218 + rmd160 9d85e9605d8b2564f99a56ca1040363784871f3a \ + sha256 f6b832972313c24b0651116cb6770c8af05784c589f01ab326e8b7cd28c40be5 \ + size 50378 # llvm-project source (needed by both subports: compiler by wasi-clang, # runtimes by wasi-libc for libcxx/libcxxabi/libunwind/compiler-rt) @@ -125,7 +125,7 @@ if {${subport} eq "wasi-libc"} { use with the wasi-clang compiler toolchain. set wasi_libc_commit \ - 2fc32bc81b9f07f8d9525edea59bfbaf760c06d6 + 161b3195fc2558d2b1ba3eb9ffae3b2b47407623 master_sites-append \ https://github.com/WebAssembly/wasi-libc/archive/:wasi_libc_src @@ -133,9 +133,9 @@ if {${subport} eq "wasi-libc"} { ${wasi_libc_commit}.tar.gz:wasi_libc_src checksums-append \ ${wasi_libc_commit}.tar.gz \ - rmd160 feba62db942d779f050e9a46f32052348dfa3819 \ - sha256 d12a1568d9394e693e6b189277ba70446f96b81a4790c515427865a0d5412372 \ - size 1636483 + rmd160 c5124d44e1c824d0d60f573b01e5aa59897e5298 \ + sha256 3bc20d349e6f9fbc4602fb29c80706a25b2875569c3320b11f7f4cf291903f9c \ + size 1657525 depends_lib-append \ port:wasi-clang diff --git a/lang/wasi-sdk/files/patch-cmake-wasi-sdk-sysroot.diff b/lang/wasi-sdk/files/patch-cmake-wasi-sdk-sysroot.diff index 01a7f133a22..52268caff8f 100644 --- a/lang/wasi-sdk/files/patch-cmake-wasi-sdk-sysroot.diff +++ b/lang/wasi-sdk/files/patch-cmake-wasi-sdk-sysroot.diff @@ -1,7 +1,7 @@ ---- cmake/wasi-sdk-sysroot.cmake.orig -+++ cmake/wasi-sdk-sysroot.cmake -@@ -329,10 +329,10 @@ - USES_TERMINAL_INSTALL ON +--- cmake/wasi-sdk-sysroot.cmake.orig 2026-05-01 22:25:57 ++++ cmake/wasi-sdk-sysroot.cmake 2026-05-01 22:26:02 +@@ -354,13 +354,13 @@ + USES_TERMINAL_PATCH ON PATCH_COMMAND ${CMAKE_COMMAND} -E chdir .. bash -c - "git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-168449.patch || git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-168449.patch -R --check" @@ -10,5 +10,10 @@ ${CMAKE_COMMAND} -E chdir .. bash -c - "git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-186054.patch || git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-186054.patch -R --check" + "patch -N -p1 < ${CMAKE_SOURCE_DIR}/src/llvm-pr-186054.patch || true" + COMMAND + ${CMAKE_COMMAND} -E chdir .. bash -c +- "git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-185770.patch || git apply ${CMAKE_SOURCE_DIR}/src/llvm-pr-185770.patch -R --check" ++ "patch -N -p1 < ${CMAKE_SOURCE_DIR}/src/llvm-pr-185770.patch || true" ) + add_dependencies(libcxx-${target} libcxx-${target}${target_suffix}-build) endfunction()