Date: Thu, 19 Mar 2026 07:46:29 +0000 From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 202fbacfe202 - main - devel/wasi-libcxx: cosmetic changes to prepare for devel/wasi-libc update Message-ID: <69bba9d5.3e9fa.4da9f41@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=202fbacfe202457f17246b11abb51f6c08a4ed9d commit 202fbacfe202457f17246b11abb51f6c08a4ed9d Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2026-03-19 07:44:28 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2026-03-19 07:44:28 +0000 devel/wasi-libcxx: cosmetic changes to prepare for devel/wasi-libc update Use ${TRIPLE} more: - reference <stdlib.h> from ${WASI_SYSROOT} for the devel/wasi-libc line - add PLIST_SUB --- devel/wasi-libcxx/Makefile | 3 ++- devel/wasi-libcxx17/pkg-plist | 6 +++--- devel/wasi-libcxx18/pkg-plist | 6 +++--- devel/wasi-libcxx19/pkg-plist | 8 ++++---- devel/wasi-libcxx20/pkg-plist | 8 ++++---- devel/wasi-libcxx21/pkg-plist | 8 ++++---- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/devel/wasi-libcxx/Makefile b/devel/wasi-libcxx/Makefile index 12d5d23ff82c..64969e490a7b 100644 --- a/devel/wasi-libcxx/Makefile +++ b/devel/wasi-libcxx/Makefile @@ -24,7 +24,7 @@ USES= cmake tar:xz IGNORE= is a meta port; there is nothing to build PKGNAMESUFFIX= -master .else -BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc@${LLVM_VERSION} \ +BUILD_DEPENDS= ${WASI_SYSROOT}/include/${TRIPLE}/stdlib.h:devel/wasi-libc@${LLVM_VERSION} \ wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} USES+= llvm:${LLVM_SUFFIX} .endif @@ -35,6 +35,7 @@ DISTINFO_FILE= ${PORTSDIR}/${LLVM_PORT}/distinfo SSP_UNSAFE= yes NO_ARCH= yes PLIST= ${.CURDIR}/pkg-plist +PLIST_SUB= TRIPLE=${TRIPLE} WASI_SYSROOT= ${LOCALBASE}/share/wasi-sysroot TRIPLE= wasm32-wasi diff --git a/devel/wasi-libcxx17/pkg-plist b/devel/wasi-libcxx17/pkg-plist index 8533f5ac3067..9a30b37484bf 100644 --- a/devel/wasi-libcxx17/pkg-plist +++ b/devel/wasi-libcxx17/pkg-plist @@ -1012,6 +1012,6 @@ share/wasi-sysroot/include/c++/v1/vector share/wasi-sysroot/include/c++/v1/version share/wasi-sysroot/include/c++/v1/wchar.h share/wasi-sysroot/include/c++/v1/wctype.h -share/wasi-sysroot/lib/wasm32-wasi/libc++.a -share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a -share/wasi-sysroot/lib/wasm32-wasi/libc++experimental.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++abi.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++experimental.a diff --git a/devel/wasi-libcxx18/pkg-plist b/devel/wasi-libcxx18/pkg-plist index e06691fe57f6..726d275d1796 100644 --- a/devel/wasi-libcxx18/pkg-plist +++ b/devel/wasi-libcxx18/pkg-plist @@ -1015,6 +1015,6 @@ share/wasi-sysroot/include/c++/v1/vector share/wasi-sysroot/include/c++/v1/version share/wasi-sysroot/include/c++/v1/wchar.h share/wasi-sysroot/include/c++/v1/wctype.h -share/wasi-sysroot/lib/wasm32-wasi/libc++.a -share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a -share/wasi-sysroot/lib/wasm32-wasi/libc++experimental.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++abi.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++experimental.a diff --git a/devel/wasi-libcxx19/pkg-plist b/devel/wasi-libcxx19/pkg-plist index 68b693dd85be..1036b49b3e88 100644 --- a/devel/wasi-libcxx19/pkg-plist +++ b/devel/wasi-libcxx19/pkg-plist @@ -1020,10 +1020,10 @@ share/wasi-sysroot/include/c++/v1/vector share/wasi-sysroot/include/c++/v1/version share/wasi-sysroot/include/c++/v1/wchar.h share/wasi-sysroot/include/c++/v1/wctype.h -share/wasi-sysroot/lib/wasm32-wasi/libc++.a -share/wasi-sysroot/lib/wasm32-wasi/libc++.modules.json -share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a -share/wasi-sysroot/lib/wasm32-wasi/libc++experimental.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++.modules.json +share/wasi-sysroot/lib/%%TRIPLE%%/libc++abi.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++experimental.a share/wasi-sysroot/share/libc++/v1/std.compat.cppm share/wasi-sysroot/share/libc++/v1/std.compat/cassert.inc share/wasi-sysroot/share/libc++/v1/std.compat/cctype.inc diff --git a/devel/wasi-libcxx20/pkg-plist b/devel/wasi-libcxx20/pkg-plist index a3ef2bcc7e0d..da2f6018c9ea 100644 --- a/devel/wasi-libcxx20/pkg-plist +++ b/devel/wasi-libcxx20/pkg-plist @@ -2082,10 +2082,10 @@ share/wasi-sysroot/include/c++/v1/vector share/wasi-sysroot/include/c++/v1/version share/wasi-sysroot/include/c++/v1/wchar.h share/wasi-sysroot/include/c++/v1/wctype.h -share/wasi-sysroot/lib/wasm32-wasi/libc++.a -share/wasi-sysroot/lib/wasm32-wasi/libc++.modules.json -share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a -share/wasi-sysroot/lib/wasm32-wasi/libc++experimental.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++.modules.json +share/wasi-sysroot/lib/%%TRIPLE%%/libc++abi.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++experimental.a share/wasi-sysroot/share/libc++/v1/std.compat.cppm share/wasi-sysroot/share/libc++/v1/std.compat/cassert.inc share/wasi-sysroot/share/libc++/v1/std.compat/cctype.inc diff --git a/devel/wasi-libcxx21/pkg-plist b/devel/wasi-libcxx21/pkg-plist index d71e8528bf72..f69b692a5a57 100644 --- a/devel/wasi-libcxx21/pkg-plist +++ b/devel/wasi-libcxx21/pkg-plist @@ -1678,10 +1678,10 @@ share/wasi-sysroot/include/c++/v1/vector share/wasi-sysroot/include/c++/v1/version share/wasi-sysroot/include/c++/v1/wchar.h share/wasi-sysroot/include/c++/v1/wctype.h -share/wasi-sysroot/lib/wasm32-wasi/libc++.a -share/wasi-sysroot/lib/wasm32-wasi/libc++.modules.json -share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a -share/wasi-sysroot/lib/wasm32-wasi/libc++experimental.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++.modules.json +share/wasi-sysroot/lib/%%TRIPLE%%/libc++abi.a +share/wasi-sysroot/lib/%%TRIPLE%%/libc++experimental.a share/wasi-sysroot/share/libc++/v1/std.compat.cppm share/wasi-sysroot/share/libc++/v1/std.compat/cassert.inc share/wasi-sysroot/share/libc++/v1/std.compat/cctype.inchome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69bba9d5.3e9fa.4da9f41>