CVS commit: pkgsrc/lang/wasi-libc

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Aug 26 07:53:56 UTC 2025

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

Log Message:
lang/wasi-libc: Fix build independently wasi-libc is already installed or not


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/wasi-libc/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/wasi-libc/distinfo
cvs rdiff -u -r1.4 -r1.5 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.23 pkgsrc/lang/wasi-libc/Makefile:1.24
--- pkgsrc/lang/wasi-libc/Makefile:1.23 Sun Aug 17 21:22:07 2025
+++ pkgsrc/lang/wasi-libc/Makefile      Tue Aug 26 07:53:56 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2025/08/17 21:22:07 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2025/08/26 07:53:56 ryoon Exp $
 
 DISTNAME=      wasi-libc-0.0.0pre20250809
 CATEGORIES=    lang
@@ -18,10 +18,6 @@ BUILTINSFILE=                libclang_rt.builtins-wasm
 DISTFILES=             ${DEFAULT_DISTFILES} ${BUILTINSFILE}
 SITES.${BUILTINSFILE}= https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/
 
-# TODO: Fix! This should not download files during build
-USE_TOOLS+=            curl
-ALLOW_NETWORK_ACCESS=  yes
-
 # Do not fail tests and compile time error (undefined symbols) in www/firefox.
 SSP_SUPPORTED=         no
 PKGSRC_USE_STACK_CHECK=        no

Index: pkgsrc/lang/wasi-libc/distinfo
diff -u pkgsrc/lang/wasi-libc/distinfo:1.4 pkgsrc/lang/wasi-libc/distinfo:1.5
--- pkgsrc/lang/wasi-libc/distinfo:1.4  Sat Aug 16 01:20:27 2025
+++ pkgsrc/lang/wasi-libc/distinfo      Tue Aug 26 07:53:56 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2025/08/16 01:20:27 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2025/08/26 07:53:56 ryoon Exp $
 
 BLAKE2s (WebAssembly-WASI-59cbe140561db52fc505555e859de884e0ee7f00.tar.gz) = e13f04fd0def3ffba6758bc700db814329a3d8dbae6df82010b1bdb5f0fbf072
 SHA512 (WebAssembly-WASI-59cbe140561db52fc505555e859de884e0ee7f00.tar.gz) = 
974228b9b4332f1805d6425a3bed2217604a63baa5ea751ebc106d57b6ec1d211453295f0a878c06bf92bc68d5173de1dffa18c56b6513e818b1d429dc312742
@@ -9,4 +9,4 @@ Size (libclang_rt.builtins-wasm32-wasi-2
 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
+SHA1 (patch-Makefile) = 2dc0f3ed86a2d57061d0dfe0d2fb9e13f444e6da

Index: pkgsrc/lang/wasi-libc/patches/patch-Makefile
diff -u pkgsrc/lang/wasi-libc/patches/patch-Makefile:1.4 pkgsrc/lang/wasi-libc/patches/patch-Makefile:1.5
--- pkgsrc/lang/wasi-libc/patches/patch-Makefile:1.4    Sat Aug 16 01:20:27 2025
+++ pkgsrc/lang/wasi-libc/patches/patch-Makefile        Tue Aug 26 07:53:56 2025
@@ -1,11 +1,21 @@
-$NetBSD: patch-Makefile,v 1.4 2025/08/16 01:20:27 ryoon Exp $
+$NetBSD: patch-Makefile,v 1.5 2025/08/26 07:53:56 ryoon Exp $
 
+* Do not depend on previously installed wasi runtime.
 * Workaround for rebuild in install stage.
 * Do not install share/ in no-check-symbols case.
 * Disable symbol comparison, it's fragile
 
 --- Makefile.orig      2025-08-08 15:50:22.000000000 +0000
 +++ Makefile
+@@ -599,7 +599,7 @@ SYSTEM_BUILTINS_LIB := $(shell ${CC} ${C
+ SYSTEM_RESOURCE_DIR := $(shell ${CC} ${CFLAGS} -print-resource-dir)
+ BUILTINS_LIB_REL_1 := $(subst $(SYSTEM_RESOURCE_DIR),,$(SYSTEM_BUILTINS_LIB))
+ # Substitute '/' for '\' so Windows paths work
+-BUILTINS_LIB_REL := $(subst \,/,$(BUILTINS_LIB_REL_1))
++BUILTINS_LIB_REL := lib/wasi
+ TMP_RESOURCE_DIR := $(OBJDIR)/resource-dir
+ BUILTINS_LIB_PATH := $(TMP_RESOURCE_DIR)/$(BUILTINS_LIB_REL)
+ BUILTINS_LIB_DIR := $(dir $(BUILTINS_LIB_PATH))
 @@ -885,9 +885,9 @@ finish: check-symbols
  endif
  endif