CVS commit: pkgsrc/lang/wasi-libc

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Aug 16 01:20:27 UTC 2025

Modified Files:
        pkgsrc/lang/wasi-libc: Makefile PLIST distinfo
        pkgsrc/lang/wasi-libc/patches: patch-Makefile

Log Message:
lang/wasi-libc: Update to 0.0.0pre20250809

Changelog:
Not available in concise form.
This includes directory layout changes.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/lang/wasi-libc/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/wasi-libc/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/wasi-libc/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/wasi-libc/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/wasi-libc/Makefile
diff -u pkgsrc/lang/wasi-libc/Makefile:1.20 pkgsrc/lang/wasi-libc/Makefile:1.21
--- pkgsrc/lang/wasi-libc/Makefile:1.20 Fri May  9 19:37:14 2025
+++ pkgsrc/lang/wasi-libc/Makefile      Sat Aug 16 01:20:27 2025
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2025/05/09 19:37:14 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2025/08/16 01:20:27 ryoon Exp $
 
-DISTNAME=      wasi-libc-0.0.0pre20231007
-PKGREVISION=   7
+DISTNAME=      wasi-libc-0.0.0pre20250809
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=WebAssembly/}
 GITHUB_PROJECT=        wasi-libc
-GITHUB_TAG=    4db5398e65c7dd343315db7e13f3dcae056466ba
+GITHUB_TAG=    08799da37ae52955427ebec1336b49d6a8eb5051
 
-GITHUB_SUBMODULES+=    WebAssembly WASI 59cbe140561db52fc505555e859de884e0ee7f00 wasi/tools/wasi-headers/WASI
+GITHUB_SUBMODULES+=    WebAssembly WASI 59cbe140561db52fc505555e859de884e0ee7f00 tools/wasi-headers/WASI
 EXTRACT_USING=         bsdtar
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
@@ -15,10 +14,17 @@ HOMEPAGE=   https://github.com/WebAssembly
 COMMENT=       libc for WebAssembly programs built on top of WASI
 LICENSE=       mit AND apache-2.0 # apache-2.0-with-LLVM-exception
 
+BUILTINSFILE=          libclang_rt.builtins-wasm32-wasi-25.0.tar.gz
+DISTFILES=             ${DEFAULT_DISTFILES} ${BUILTINSFILE}
+SITES.${BUILTINSFILE}= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/
+
 # Do not fail tests and compile time error (undefined symbols) in www/firefox.
 SSP_SUPPORTED=         no
 PKGSRC_USE_STACK_CHECK=        no
 
+# clang/wasm does not accept RELRO flags.
+RELRO_SUPPORTED=       no
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 .  if ${OPSYS_VERSION} < 099900
@@ -27,7 +33,8 @@ TOOLS_PLATFORM.find=  # empty
 .  endif
 .endif
 
-USE_TOOLS+=    gmake
+USE_TOOLS+=    bash gmake
+REPLACE_BASH+= scripts/install-include-headers.sh
 
 # Do not crush clang-13
 BUILDLINK_TRANSFORM+=  rm:-fcommon
@@ -37,16 +44,20 @@ MAKE_FLAGS+=        CC=clang
 MAKE_FLAGS+=   AR=${PREFIX}/bin/llvm-ar
 MAKE_FLAGS+=   NM=${PREFIX}/bin/llvm-nm
 MAKE_FLAGS+=   INSTALL_DIR=${DESTDIR}${PREFIX}/wasi
-BUILD_TARGET=  finish
+#BUILD_TARGET= finish
+BUILD_TARGET=  no-check-symbols
 
 # iconv.h from libiconv get pulled in on SunOS (via clang)
 # It conflicts with musl libc so must be removed.
 pre-configure:
        rm -f ${BUILDLINK_DIR}/include/iconv.h
+       ${MKDIR} ${WRKSRC}/build/wasm32-wasi/resource-dir/lib/wasm32-unknown-wasi
+       ${MV} ${WRKDIR}/libclang_rt.builtins-wasm32-wasi-25.0/*.a \
+               ${WRKSRC}/build/wasm32-wasi/resource-dir/lib/wasm32-unknown-wasi
 
 ABI=                   # 32
-CFLAGS=                        -O2
-CXXFLAGS=              -O2
+CFLAGS+=               -O2
+CXXFLAGS+=             -O2
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build
@@ -56,4 +67,5 @@ BUILDLINK_DEPMETHOD.llvm=     build
 .if empty(PKG_BUILD_OPTIONS.llvm:Mllvm-target-webassembly)
 PKG_FAIL_REASON+=      "llvm-target-webassembly PKG_OPTION must be enabled in lang/llvm"
 .endif
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/lang/wasi-libc/PLIST
diff -u pkgsrc/lang/wasi-libc/PLIST:1.1 pkgsrc/lang/wasi-libc/PLIST:1.2
--- pkgsrc/lang/wasi-libc/PLIST:1.1     Sun Dec 19 13:38:56 2021
+++ pkgsrc/lang/wasi-libc/PLIST Sat Aug 16 01:20:27 2025
@@ -1,219 +1,224 @@
-@comment $NetBSD: PLIST,v 1.1 2021/12/19 13:38:56 ryoon Exp $
-wasi/include/__errno.h
-wasi/include/__errno_values.h
-wasi/include/__fd_set.h
-wasi/include/__function___isatty.h
-wasi/include/__functions_malloc.h
-wasi/include/__functions_memcpy.h
-wasi/include/__header_dirent.h
-wasi/include/__header_fcntl.h
-wasi/include/__header_inttypes.h
-wasi/include/__header_netinet_in.h
-wasi/include/__header_poll.h
-wasi/include/__header_stdlib.h
-wasi/include/__header_string.h
-wasi/include/__header_sys_ioctl.h
-wasi/include/__header_sys_resource.h
-wasi/include/__header_sys_socket.h
-wasi/include/__header_sys_stat.h
-wasi/include/__header_time.h
-wasi/include/__header_unistd.h
-wasi/include/__macro_FD_SETSIZE.h
-wasi/include/__macro_PAGESIZE.h
-wasi/include/__mode_t.h
-wasi/include/__seek.h
-wasi/include/__struct_dirent.h
-wasi/include/__struct_in6_addr.h
-wasi/include/__struct_in_addr.h
-wasi/include/__struct_iovec.h
-wasi/include/__struct_msghdr.h
-wasi/include/__struct_pollfd.h
-wasi/include/__struct_rusage.h
-wasi/include/__struct_sockaddr.h
-wasi/include/__struct_sockaddr_in.h
-wasi/include/__struct_sockaddr_in6.h
-wasi/include/__struct_sockaddr_storage.h
-wasi/include/__struct_sockaddr_un.h
-wasi/include/__struct_stat.h
-wasi/include/__struct_timespec.h
-wasi/include/__struct_timeval.h
-wasi/include/__struct_tm.h
-wasi/include/__struct_tms.h
-wasi/include/__typedef_DIR.h
-wasi/include/__typedef_blkcnt_t.h
-wasi/include/__typedef_blksize_t.h
-wasi/include/__typedef_clock_t.h
-wasi/include/__typedef_clockid_t.h
-wasi/include/__typedef_dev_t.h
-wasi/include/__typedef_fd_set.h
-wasi/include/__typedef_gid_t.h
-wasi/include/__typedef_in_addr_t.h
-wasi/include/__typedef_in_port_t.h
-wasi/include/__typedef_ino_t.h
-wasi/include/__typedef_mode_t.h
-wasi/include/__typedef_nfds_t.h
-wasi/include/__typedef_nlink_t.h
-wasi/include/__typedef_off_t.h
-wasi/include/__typedef_sa_family_t.h
-wasi/include/__typedef_sigset_t.h
-wasi/include/__typedef_socklen_t.h
-wasi/include/__typedef_ssize_t.h
-wasi/include/__typedef_suseconds_t.h
-wasi/include/__typedef_time_t.h
-wasi/include/__typedef_uid_t.h
-wasi/include/alloca.h
-wasi/include/ar.h
-wasi/include/arpa/ftp.h
-wasi/include/arpa/inet.h
-wasi/include/arpa/nameser.h
-wasi/include/arpa/nameser_compat.h
-wasi/include/arpa/telnet.h
-wasi/include/arpa/tftp.h
-wasi/include/assert.h
-wasi/include/bits/alltypes.h
-wasi/include/bits/dirent.h
-wasi/include/bits/fcntl.h
-wasi/include/bits/fenv.h
-wasi/include/bits/float.h
-wasi/include/bits/hwcap.h
-wasi/include/bits/io.h
-wasi/include/bits/ioctl.h
-wasi/include/bits/ioctl_fix.h
-wasi/include/bits/ipcstat.h
-wasi/include/bits/limits.h
-wasi/include/bits/mman.h
-wasi/include/bits/poll.h
-wasi/include/bits/posix.h
-wasi/include/bits/reg.h
-wasi/include/bits/resource.h
-wasi/include/bits/signal.h
-wasi/include/bits/socket.h
-wasi/include/bits/stat.h
-wasi/include/bits/stdint.h
-wasi/include/byteswap.h
-wasi/include/complex.h
-wasi/include/cpio.h
-wasi/include/crypt.h
-wasi/include/ctype.h
-wasi/include/dirent.h
-wasi/include/endian.h
-wasi/include/err.h
-wasi/include/errno.h
-wasi/include/fcntl.h
-wasi/include/features.h
-wasi/include/fenv.h
-wasi/include/float.h
-wasi/include/fmtmsg.h
-wasi/include/fnmatch.h
-wasi/include/ftw.h
-wasi/include/getopt.h
-wasi/include/glob.h
-wasi/include/iconv.h
-wasi/include/ifaddrs.h
-wasi/include/inttypes.h
-wasi/include/iso646.h
-wasi/include/langinfo.h
-wasi/include/libgen.h
-wasi/include/limits.h
-wasi/include/locale.h
-wasi/include/malloc.h
-wasi/include/math.h
-wasi/include/memory.h
-wasi/include/monetary.h
-wasi/include/mqueue.h
-wasi/include/netinet/icmp6.h
-wasi/include/netinet/igmp.h
-wasi/include/netinet/in.h
-wasi/include/netinet/in_systm.h
-wasi/include/netinet/ip.h
-wasi/include/netinet/ip6.h
-wasi/include/netinet/ip_icmp.h
-wasi/include/netinet/tcp.h
-wasi/include/netinet/udp.h
-wasi/include/netpacket/packet.h
-wasi/include/nl_types.h
-wasi/include/poll.h
-wasi/include/regex.h
-wasi/include/sched.h
-wasi/include/search.h
-wasi/include/semaphore.h
-wasi/include/signal.h
-wasi/include/stdalign.h
-wasi/include/stdbool.h
-wasi/include/stdc-predef.h
-wasi/include/stdint.h
-wasi/include/stdio.h
-wasi/include/stdio_ext.h
-wasi/include/stdlib.h
-wasi/include/stdnoreturn.h
-wasi/include/string.h
-wasi/include/strings.h
-wasi/include/stropts.h
-wasi/include/sys/dir.h
-wasi/include/sys/errno.h
-wasi/include/sys/eventfd.h
-wasi/include/sys/fcntl.h
-wasi/include/sys/file.h
-wasi/include/sys/ioctl.h
-wasi/include/sys/mman.h
-wasi/include/sys/param.h
-wasi/include/sys/poll.h
-wasi/include/sys/random.h
-wasi/include/sys/reg.h
-wasi/include/sys/resource.h
-wasi/include/sys/select.h
-wasi/include/sys/signal.h
-wasi/include/sys/socket.h
-wasi/include/sys/stat.h
-wasi/include/sys/stropts.h
-wasi/include/sys/syscall.h
-wasi/include/sys/sysinfo.h
-wasi/include/sys/time.h
-wasi/include/sys/timeb.h
-wasi/include/sys/times.h
-wasi/include/sys/timex.h
-wasi/include/sys/ttydefaults.h
-wasi/include/sys/types.h
-wasi/include/sys/uio.h
-wasi/include/sys/un.h
-wasi/include/sys/utsname.h
-wasi/include/syscall.h
-wasi/include/sysexits.h
-wasi/include/tar.h
-wasi/include/tgmath.h
-wasi/include/threads.h
-wasi/include/time.h
-wasi/include/uchar.h
-wasi/include/unistd.h
-wasi/include/utime.h
-wasi/include/values.h
-wasi/include/wasi/api.h
-wasi/include/wasi/libc-environ.h
-wasi/include/wasi/libc-find-relpath.h
-wasi/include/wasi/libc-nocwd.h
-wasi/include/wasi/libc.h
-wasi/include/wchar.h
-wasi/include/wctype.h
+@comment $NetBSD: PLIST,v 1.2 2025/08/16 01:20:27 ryoon Exp $
+wasi/include/wasm32-wasi/__errno.h
+wasi/include/wasm32-wasi/__errno_values.h
+wasi/include/wasm32-wasi/__fd_set.h
+wasi/include/wasm32-wasi/__function___isatty.h
+wasi/include/wasm32-wasi/__functions_malloc.h
+wasi/include/wasm32-wasi/__functions_memcpy.h
+wasi/include/wasm32-wasi/__header_dirent.h
+wasi/include/wasm32-wasi/__header_fcntl.h
+wasi/include/wasm32-wasi/__header_inttypes.h
+wasi/include/wasm32-wasi/__header_netinet_in.h
+wasi/include/wasm32-wasi/__header_poll.h
+wasi/include/wasm32-wasi/__header_stdlib.h
+wasi/include/wasm32-wasi/__header_string.h
+wasi/include/wasm32-wasi/__header_sys_ioctl.h
+wasi/include/wasm32-wasi/__header_sys_resource.h
+wasi/include/wasm32-wasi/__header_sys_socket.h
+wasi/include/wasm32-wasi/__header_sys_stat.h
+wasi/include/wasm32-wasi/__header_time.h
+wasi/include/wasm32-wasi/__header_unistd.h
+wasi/include/wasm32-wasi/__macro_FD_SETSIZE.h
+wasi/include/wasm32-wasi/__macro_PAGESIZE.h
+wasi/include/wasm32-wasi/__mode_t.h
+wasi/include/wasm32-wasi/__seek.h
+wasi/include/wasm32-wasi/__struct_dirent.h
+wasi/include/wasm32-wasi/__struct_in6_addr.h
+wasi/include/wasm32-wasi/__struct_in_addr.h
+wasi/include/wasm32-wasi/__struct_iovec.h
+wasi/include/wasm32-wasi/__struct_msghdr.h
+wasi/include/wasm32-wasi/__struct_pollfd.h
+wasi/include/wasm32-wasi/__struct_rusage.h
+wasi/include/wasm32-wasi/__struct_sockaddr.h
+wasi/include/wasm32-wasi/__struct_sockaddr_in.h
+wasi/include/wasm32-wasi/__struct_sockaddr_in6.h
+wasi/include/wasm32-wasi/__struct_sockaddr_storage.h
+wasi/include/wasm32-wasi/__struct_sockaddr_un.h
+wasi/include/wasm32-wasi/__struct_stat.h
+wasi/include/wasm32-wasi/__struct_timespec.h
+wasi/include/wasm32-wasi/__struct_timeval.h
+wasi/include/wasm32-wasi/__struct_tm.h
+wasi/include/wasm32-wasi/__struct_tms.h
+wasi/include/wasm32-wasi/__typedef_DIR.h
+wasi/include/wasm32-wasi/__typedef_blkcnt_t.h
+wasi/include/wasm32-wasi/__typedef_blksize_t.h
+wasi/include/wasm32-wasi/__typedef_clock_t.h
+wasi/include/wasm32-wasi/__typedef_clockid_t.h
+wasi/include/wasm32-wasi/__typedef_dev_t.h
+wasi/include/wasm32-wasi/__typedef_fd_set.h
+wasi/include/wasm32-wasi/__typedef_gid_t.h
+wasi/include/wasm32-wasi/__typedef_in_addr_t.h
+wasi/include/wasm32-wasi/__typedef_in_port_t.h
+wasi/include/wasm32-wasi/__typedef_ino_t.h
+wasi/include/wasm32-wasi/__typedef_mode_t.h
+wasi/include/wasm32-wasi/__typedef_nfds_t.h
+wasi/include/wasm32-wasi/__typedef_nlink_t.h
+wasi/include/wasm32-wasi/__typedef_off_t.h
+wasi/include/wasm32-wasi/__typedef_sa_family_t.h
+wasi/include/wasm32-wasi/__typedef_sigset_t.h
+wasi/include/wasm32-wasi/__typedef_socklen_t.h
+wasi/include/wasm32-wasi/__typedef_ssize_t.h
+wasi/include/wasm32-wasi/__typedef_suseconds_t.h
+wasi/include/wasm32-wasi/__typedef_time_t.h
+wasi/include/wasm32-wasi/__typedef_uid_t.h
+wasi/include/wasm32-wasi/__wasi_snapshot.h
+wasi/include/wasm32-wasi/alloca.h
+wasi/include/wasm32-wasi/ar.h
+wasi/include/wasm32-wasi/arpa/ftp.h
+wasi/include/wasm32-wasi/arpa/inet.h
+wasi/include/wasm32-wasi/arpa/nameser.h
+wasi/include/wasm32-wasi/arpa/nameser_compat.h
+wasi/include/wasm32-wasi/arpa/telnet.h
+wasi/include/wasm32-wasi/arpa/tftp.h
+wasi/include/wasm32-wasi/assert.h
+wasi/include/wasm32-wasi/bits/alltypes.h
+wasi/include/wasm32-wasi/bits/dirent.h
+wasi/include/wasm32-wasi/bits/fcntl.h
+wasi/include/wasm32-wasi/bits/fenv.h
+wasi/include/wasm32-wasi/bits/float.h
+wasi/include/wasm32-wasi/bits/hwcap.h
+wasi/include/wasm32-wasi/bits/io.h
+wasi/include/wasm32-wasi/bits/ioctl.h
+wasi/include/wasm32-wasi/bits/ioctl_fix.h
+wasi/include/wasm32-wasi/bits/ipcstat.h
+wasi/include/wasm32-wasi/bits/limits.h
+wasi/include/wasm32-wasi/bits/mman.h
+wasi/include/wasm32-wasi/bits/poll.h
+wasi/include/wasm32-wasi/bits/posix.h
+wasi/include/wasm32-wasi/bits/reg.h
+wasi/include/wasm32-wasi/bits/resource.h
+wasi/include/wasm32-wasi/bits/setjmp.h
+wasi/include/wasm32-wasi/bits/signal.h
+wasi/include/wasm32-wasi/bits/socket.h
+wasi/include/wasm32-wasi/bits/stat.h
+wasi/include/wasm32-wasi/bits/stdint.h
+wasi/include/wasm32-wasi/byteswap.h
+wasi/include/wasm32-wasi/complex.h
+wasi/include/wasm32-wasi/cpio.h
+wasi/include/wasm32-wasi/crypt.h
+wasi/include/wasm32-wasi/ctype.h
+wasi/include/wasm32-wasi/dirent.h
+wasi/include/wasm32-wasi/dlfcn.h
+wasi/include/wasm32-wasi/endian.h
+wasi/include/wasm32-wasi/err.h
+wasi/include/wasm32-wasi/errno.h
+wasi/include/wasm32-wasi/fcntl.h
+wasi/include/wasm32-wasi/features.h
+wasi/include/wasm32-wasi/fenv.h
+wasi/include/wasm32-wasi/float.h
+wasi/include/wasm32-wasi/fmtmsg.h
+wasi/include/wasm32-wasi/fnmatch.h
+wasi/include/wasm32-wasi/fts.h
+wasi/include/wasm32-wasi/ftw.h
+wasi/include/wasm32-wasi/getopt.h
+wasi/include/wasm32-wasi/glob.h
+wasi/include/wasm32-wasi/iconv.h
+wasi/include/wasm32-wasi/ifaddrs.h
+wasi/include/wasm32-wasi/inttypes.h
+wasi/include/wasm32-wasi/iso646.h
+wasi/include/wasm32-wasi/langinfo.h
+wasi/include/wasm32-wasi/libgen.h
+wasi/include/wasm32-wasi/limits.h
+wasi/include/wasm32-wasi/locale.h
+wasi/include/wasm32-wasi/malloc.h
+wasi/include/wasm32-wasi/math.h
+wasi/include/wasm32-wasi/memory.h
+wasi/include/wasm32-wasi/monetary.h
+wasi/include/wasm32-wasi/mqueue.h
+wasi/include/wasm32-wasi/netinet/icmp6.h
+wasi/include/wasm32-wasi/netinet/igmp.h
+wasi/include/wasm32-wasi/netinet/in.h
+wasi/include/wasm32-wasi/netinet/in_systm.h
+wasi/include/wasm32-wasi/netinet/ip.h
+wasi/include/wasm32-wasi/netinet/ip6.h
+wasi/include/wasm32-wasi/netinet/ip_icmp.h
+wasi/include/wasm32-wasi/netinet/tcp.h
+wasi/include/wasm32-wasi/netinet/udp.h
+wasi/include/wasm32-wasi/netpacket/packet.h
+wasi/include/wasm32-wasi/nl_types.h
+wasi/include/wasm32-wasi/poll.h
+wasi/include/wasm32-wasi/pthread.h
+wasi/include/wasm32-wasi/regex.h
+wasi/include/wasm32-wasi/sched.h
+wasi/include/wasm32-wasi/search.h
+wasi/include/wasm32-wasi/semaphore.h
+wasi/include/wasm32-wasi/setjmp.h
+wasi/include/wasm32-wasi/signal.h
+wasi/include/wasm32-wasi/stdalign.h
+wasi/include/wasm32-wasi/stdbool.h
+wasi/include/wasm32-wasi/stdc-predef.h
+wasi/include/wasm32-wasi/stdint.h
+wasi/include/wasm32-wasi/stdio.h
+wasi/include/wasm32-wasi/stdio_ext.h
+wasi/include/wasm32-wasi/stdlib.h
+wasi/include/wasm32-wasi/stdnoreturn.h
+wasi/include/wasm32-wasi/string.h
+wasi/include/wasm32-wasi/strings.h
+wasi/include/wasm32-wasi/stropts.h
+wasi/include/wasm32-wasi/sys/dir.h
+wasi/include/wasm32-wasi/sys/errno.h
+wasi/include/wasm32-wasi/sys/eventfd.h
+wasi/include/wasm32-wasi/sys/fcntl.h
+wasi/include/wasm32-wasi/sys/file.h
+wasi/include/wasm32-wasi/sys/ioctl.h
+wasi/include/wasm32-wasi/sys/mman.h
+wasi/include/wasm32-wasi/sys/param.h
+wasi/include/wasm32-wasi/sys/poll.h
+wasi/include/wasm32-wasi/sys/random.h
+wasi/include/wasm32-wasi/sys/reg.h
+wasi/include/wasm32-wasi/sys/resource.h
+wasi/include/wasm32-wasi/sys/select.h
+wasi/include/wasm32-wasi/sys/signal.h
+wasi/include/wasm32-wasi/sys/socket.h
+wasi/include/wasm32-wasi/sys/stat.h
+wasi/include/wasm32-wasi/sys/statvfs.h
+wasi/include/wasm32-wasi/sys/stropts.h
+wasi/include/wasm32-wasi/sys/syscall.h
+wasi/include/wasm32-wasi/sys/sysinfo.h
+wasi/include/wasm32-wasi/sys/time.h
+wasi/include/wasm32-wasi/sys/timeb.h
+wasi/include/wasm32-wasi/sys/times.h
+wasi/include/wasm32-wasi/sys/timex.h
+wasi/include/wasm32-wasi/sys/ttydefaults.h
+wasi/include/wasm32-wasi/sys/types.h
+wasi/include/wasm32-wasi/sys/uio.h
+wasi/include/wasm32-wasi/sys/un.h
+wasi/include/wasm32-wasi/sys/utsname.h
+wasi/include/wasm32-wasi/syscall.h
+wasi/include/wasm32-wasi/sysexits.h
+wasi/include/wasm32-wasi/tar.h
+wasi/include/wasm32-wasi/tgmath.h
+wasi/include/wasm32-wasi/threads.h
+wasi/include/wasm32-wasi/time.h
+wasi/include/wasm32-wasi/uchar.h
+wasi/include/wasm32-wasi/unistd.h
+wasi/include/wasm32-wasi/utime.h
+wasi/include/wasm32-wasi/values.h
+wasi/include/wasm32-wasi/wasi/api.h
+wasi/include/wasm32-wasi/wasi/libc-busywait.h
+wasi/include/wasm32-wasi/wasi/libc-environ.h
+wasi/include/wasm32-wasi/wasi/libc-find-relpath.h
+wasi/include/wasm32-wasi/wasi/libc-nocwd.h
+wasi/include/wasm32-wasi/wasi/libc.h
+wasi/include/wasm32-wasi/wasi/wasip2.h
+wasi/include/wasm32-wasi/wchar.h
+wasi/include/wasm32-wasi/wctype.h
 wasi/lib/wasm32-wasi/crt1-command.o
 wasi/lib/wasm32-wasi/crt1-reactor.o
 wasi/lib/wasm32-wasi/crt1.o
 wasi/lib/wasm32-wasi/libc-printscan-long-double.a
 wasi/lib/wasm32-wasi/libc-printscan-no-floating-point.a
 wasi/lib/wasm32-wasi/libc.a
-wasi/lib/wasm32-wasi/libc.imports
 wasi/lib/wasm32-wasi/libcrypt.a
 wasi/lib/wasm32-wasi/libdl.a
 wasi/lib/wasm32-wasi/libm.a
 wasi/lib/wasm32-wasi/libpthread.a
 wasi/lib/wasm32-wasi/libresolv.a
 wasi/lib/wasm32-wasi/librt.a
+wasi/lib/wasm32-wasi/libsetjmp.a
 wasi/lib/wasm32-wasi/libutil.a
 wasi/lib/wasm32-wasi/libwasi-emulated-getpid.a
 wasi/lib/wasm32-wasi/libwasi-emulated-mman.a
 wasi/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
 wasi/lib/wasm32-wasi/libwasi-emulated-signal.a
 wasi/lib/wasm32-wasi/libxnet.a
-wasi/share/wasm32-wasi/defined-symbols.txt
-wasi/share/wasm32-wasi/include-all.c
-wasi/share/wasm32-wasi/predefined-macros.txt
-wasi/share/wasm32-wasi/undefined-symbols.txt

Index: pkgsrc/lang/wasi-libc/distinfo
diff -u pkgsrc/lang/wasi-libc/distinfo:1.3 pkgsrc/lang/wasi-libc/distinfo:1.4
--- pkgsrc/lang/wasi-libc/distinfo:1.3  Wed Oct 11 03:41:00 2023
+++ pkgsrc/lang/wasi-libc/distinfo      Sat Aug 16 01:20:27 2025
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.3 2023/10/11 03:41:00 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2025/08/16 01:20:27 ryoon Exp $
 
 BLAKE2s (WebAssembly-WASI-59cbe140561db52fc505555e859de884e0ee7f00.tar.gz) = e13f04fd0def3ffba6758bc700db814329a3d8dbae6df82010b1bdb5f0fbf072
 SHA512 (WebAssembly-WASI-59cbe140561db52fc505555e859de884e0ee7f00.tar.gz) = 
974228b9b4332f1805d6425a3bed2217604a63baa5ea751ebc106d57b6ec1d211453295f0a878c06bf92bc68d5173de1dffa18c56b6513e818b1d429dc312742
 Size (WebAssembly-WASI-59cbe140561db52fc505555e859de884e0ee7f00.tar.gz) = 162204 bytes
-BLAKE2s (wasi-libc-0.0.0pre20231007-4db5398e65c7dd343315db7e13f3dcae056466ba.tar.gz) = 50b7b85e1efaf44f21e29ee6843250cbd57244ccce8b5e26f83347c8ede24cba
-SHA512 (wasi-libc-0.0.0pre20231007-4db5398e65c7dd343315db7e13f3dcae056466ba.tar.gz) = 
b1bcac7f6d50da5cf2724e7efab82e6f055e5315e1d2a2ebdf88cf3e1c1be1ed56e32aa31156ce43c65a346279cedf795cd02669460869b996b4c168d1299c9c
-Size (wasi-libc-0.0.0pre20231007-4db5398e65c7dd343315db7e13f3dcae056466ba.tar.gz) = 1312121 bytes
-SHA1 (patch-Makefile) = 009c372803a6e4fc5a37833f9ea265f5bf7fa1ae
+BLAKE2s (libclang_rt.builtins-wasm32-wasi-25.0.tar.gz) = 6447e44d3c3c1cac011f69ed70de7217b10042d86cf3c3f90f0c84828a908771
+SHA512 (libclang_rt.builtins-wasm32-wasi-25.0.tar.gz) = eff32570d2480601d11126b0ba421632d544a8ba438be69040dd00c1933f2fcfde77eb8b45786859c49caf4fef2cc14b62ce03b6a67eed509fa4e74d9685dd81
+Size (libclang_rt.builtins-wasm32-wasi-25.0.tar.gz) = 128688 bytes
+BLAKE2s (wasi-libc-0.0.0pre20250809-08799da37ae52955427ebec1336b49d6a8eb5051.tar.gz) = 7359820b1543617f0ccf901625a9614cbce0735b81ab1e8c974adf9088c9ec24
+SHA512 (wasi-libc-0.0.0pre20250809-08799da37ae52955427ebec1336b49d6a8eb5051.tar.gz) = 
3a1c0ba0d24fc0ff9bca936e4e747efa3c6f1f5177d005d99582674a5f96d88db63622145df0a4a6b128364a80193df14e7269bc144254b57a1402bf1e534730
+Size (wasi-libc-0.0.0pre20250809-08799da37ae52955427ebec1336b49d6a8eb5051.tar.gz) = 1473084 bytes
+SHA1 (patch-Makefile) = de8af5d2dd444cfe1235c580980acc74bb8f3725

Index: pkgsrc/lang/wasi-libc/patches/patch-Makefile
diff -u pkgsrc/lang/wasi-libc/patches/patch-Makefile:1.3 pkgsrc/lang/wasi-libc/patches/patch-Makefile:1.4
--- pkgsrc/lang/wasi-libc/patches/patch-Makefile:1.3    Wed Oct 11 03:41:01 2023
+++ pkgsrc/lang/wasi-libc/patches/patch-Makefile        Sat Aug 16 01:20:27 2025
@@ -1,19 +1,29 @@
-$NetBSD: patch-Makefile,v 1.3 2023/10/11 03:41:01 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.4 2025/08/16 01:20:27 ryoon Exp $
 
-* Disable symbol comparison, it's fragile
 * Workaround for rebuild in install stage.
+* Do not install share/ in no-check-symbols case.
+* Disable symbol comparison, it's fragile
 
---- Makefile.orig      2023-10-07 00:10:58.000000000 +0000
+--- Makefile.orig      2025-08-08 15:50:22.000000000 +0000
 +++ Makefile
-@@ -790,9 +790,9 @@ check-symbols: startup_files libc
- 
-       # Check that the computed metadata matches the expected metadata.
-       # This ignores whitespace because on Windows the output has CRLF line endings.
--      diff -wur "expected/$(TARGET_TRIPLE)" "$(SYSROOT_SHARE)"
-+      #diff -wur "expected/$(TARGET_TRIPLE)" "$(SYSROOT_SHARE)"
+@@ -885,9 +885,9 @@ finish: check-symbols
+ endif
+ endif
  
 -install: finish
 +install:
        mkdir -p "$(INSTALL_DIR)"
-       cp -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
+-      cp -p -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
++      cp -p -r "$(SYSROOT)/lib" "$(SYSROOT)/include" "$(INSTALL_DIR)"
+ 
+ DEFINED_SYMBOLS = $(SYSROOT_SHARE)/defined-symbols.txt
+ UNDEFINED_SYMBOLS = $(SYSROOT_SHARE)/undefined-symbols.txt
+@@ -1018,7 +1018,7 @@ check-symbols: $(STARTUP_FILES) libc
+ 
+       # Check that the computed metadata matches the expected metadata.
+       # This ignores whitespace because on Windows the output has CRLF line endings.
+-      diff -wur "$(EXPECTED_TARGET_DIR)" "$(SYSROOT_SHARE)"
++      #diff -wur "$(EXPECTED_TARGET_DIR)" "$(SYSROOT_SHARE)"
+ 
  
+ ##### BINDINGS #################################################################