Re: git: 1aa742d29cd2 - main - devel/wasi-libc: fix plist for non-LLVM 21 flavours

From: Nuno Teixeira <eduardo_at_freebsd.org>
Date: Thu, 28 Aug 2025 21:06:24 UTC
Thanks for fast fix!

Cheers,

Charlie Li <vishwin@freebsd.org> escreveu (quinta, 28/08/2025 à(s) 21:52):

> The branch main has been updated by vishwin:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=1aa742d29cd2e335a1268fdaea5c572f7bbb2c48
>
> commit 1aa742d29cd2e335a1268fdaea5c572f7bbb2c48
> Author:     Charlie Li <vishwin@FreeBSD.org>
> AuthorDate: 2025-08-28 20:50:27 +0000
> Commit:     Charlie Li <vishwin@FreeBSD.org>
> CommitDate: 2025-08-28 20:50:27 +0000
>
>     devel/wasi-libc: fix plist for non-LLVM 21 flavours
>
>     <wasi/libc-busywait.h> is added and libwasi-emulated-pthread is removed
>
>     Reported by: eduardo
> ---
>  devel/wasi-libc/pkg-plist17 | 2 +-
>  devel/wasi-libc/pkg-plist18 | 2 +-
>  devel/wasi-libc/pkg-plist19 | 2 +-
>  devel/wasi-libc/pkg-plist20 | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/devel/wasi-libc/pkg-plist17 b/devel/wasi-libc/pkg-plist17
> index 3081c285f23d..e5f511396f74 100644
> --- a/devel/wasi-libc/pkg-plist17
> +++ b/devel/wasi-libc/pkg-plist17
> @@ -197,6 +197,7 @@ share/wasi-sysroot/include/wasm32-wasi/unistd.h
>  share/wasi-sysroot/include/wasm32-wasi/utime.h
>  share/wasi-sysroot/include/wasm32-wasi/values.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
> +share/wasi-sysroot/include/wasm32-wasi/wasi/libc-busywait.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
> @@ -222,7 +223,6 @@ share/wasi-sysroot/lib/wasm32-wasi/libutil.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
> -share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-pthread.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
>  share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
>  share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
> diff --git a/devel/wasi-libc/pkg-plist18 b/devel/wasi-libc/pkg-plist18
> index de08ff484d88..d0cf795762ad 100644
> --- a/devel/wasi-libc/pkg-plist18
> +++ b/devel/wasi-libc/pkg-plist18
> @@ -211,6 +211,7 @@ share/wasi-sysroot/include/wasm32-wasi/unistd.h
>  share/wasi-sysroot/include/wasm32-wasi/utime.h
>  share/wasi-sysroot/include/wasm32-wasi/values.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
> +share/wasi-sysroot/include/wasm32-wasi/wasi/libc-busywait.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
> @@ -236,7 +237,6 @@ share/wasi-sysroot/lib/wasm32-wasi/libutil.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
> -share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-pthread.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
>  share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
>  share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
> diff --git a/devel/wasi-libc/pkg-plist19 b/devel/wasi-libc/pkg-plist19
> index f0b2808b051d..a41ba16fa7c8 100644
> --- a/devel/wasi-libc/pkg-plist19
> +++ b/devel/wasi-libc/pkg-plist19
> @@ -213,6 +213,7 @@ share/wasi-sysroot/include/wasm32-wasi/unistd.h
>  share/wasi-sysroot/include/wasm32-wasi/utime.h
>  share/wasi-sysroot/include/wasm32-wasi/values.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
> +share/wasi-sysroot/include/wasm32-wasi/wasi/libc-busywait.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
> @@ -238,7 +239,6 @@ share/wasi-sysroot/lib/wasm32-wasi/libutil.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
> -share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-pthread.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
>  share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
>  share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
> diff --git a/devel/wasi-libc/pkg-plist20 b/devel/wasi-libc/pkg-plist20
> index f0b2808b051d..a41ba16fa7c8 100644
> --- a/devel/wasi-libc/pkg-plist20
> +++ b/devel/wasi-libc/pkg-plist20
> @@ -213,6 +213,7 @@ share/wasi-sysroot/include/wasm32-wasi/unistd.h
>  share/wasi-sysroot/include/wasm32-wasi/utime.h
>  share/wasi-sysroot/include/wasm32-wasi/values.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
> +share/wasi-sysroot/include/wasm32-wasi/wasi/libc-busywait.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
>  share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
> @@ -238,7 +239,6 @@ share/wasi-sysroot/lib/wasm32-wasi/libutil.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
> -share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-pthread.a
>  share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
>  share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
>  share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
>


-- 
Nuno Teixeira
FreeBSD UNIX:  <eduardo@FreeBSD.org>   Web:  https://FreeBSD.org