From 9998918dbbc52c279b9c74cc34f6c67f6cdba1df Mon Sep 17 00:00:00 2001
From: Konstantin Pavlov <thresh@nginx.com>
Date: Thu, 5 Sep 2024 20:22:14 +0000
Subject: Packages: bump wasmtime to 24.0.0 and wasi-sysroot to 24.0.

Wasm module is now not built for Amazon Linux 2, Debian 11 and Ubuntu
2.0.04, since it requires cmake version newer than what's available on
those OSes.  wasm-wasi-component is not affected.
---
 pkg/contrib/src/wasmtime/Makefile   | 13 +++++++------
 pkg/contrib/src/wasmtime/SHA512SUMS |  2 +-
 pkg/contrib/src/wasmtime/version    |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'pkg/contrib/src/wasmtime')

diff --git a/pkg/contrib/src/wasmtime/Makefile b/pkg/contrib/src/wasmtime/Makefile
index 11797fee..2a6e8abf 100644
--- a/pkg/contrib/src/wasmtime/Makefile
+++ b/pkg/contrib/src/wasmtime/Makefile
@@ -11,10 +11,6 @@ else
 CARGO = $(error Cargo (Rust package manager) not found)
 endif
 
-ifeq ($(shell uname -s),Linux)
-WASMTIME_ARGS=-Clink-arg=-Wl,-soname,libwasmtime.so
-endif
-
 $(TARBALLS)/wasmtime-v$(WASMTIME_VERSION)-src.tar.gz:
 	$(call download_pkg,$(WASMTIME_URL),wasmtime)
 
@@ -25,6 +21,11 @@ wasmtime: wasmtime-v$(WASMTIME_VERSION)-src.tar.gz .sum-wasmtime
 	$(MOVE)
 
 .wasmtime: wasmtime
-	cd $< && $(CARGO) rustc --release -p wasmtime-c-api -- $(WASMTIME_ARGS)
-	cp $</crates/c-api/wasm-c-api/include/wasm.h $</crates/c-api/include/
+	cd $< && cmake \
+				-DCMAKE_INSTALL_LIBDIR=lib \
+				-S crates/c-api \
+				-B target/c-api \
+				--install-prefix "$(TOPSRC)/wasmtime/artifacts"
+	cd $< && cmake --build target/c-api
+	cd $< && cmake --install target/c-api
 	touch $@
diff --git a/pkg/contrib/src/wasmtime/SHA512SUMS b/pkg/contrib/src/wasmtime/SHA512SUMS
index 35e0e47f..fc1ba863 100644
--- a/pkg/contrib/src/wasmtime/SHA512SUMS
+++ b/pkg/contrib/src/wasmtime/SHA512SUMS
@@ -1 +1 @@
-4b67ba0742da0558efffe1dbde5512dc5f0201fad25f1027d277758e76778b2add11528dbe3f5b7759f2386859b52aea3a0526abaa481c2ed91eb56c5a531b49  wasmtime-v11.0.1-src.tar.gz
+2ce3979f772176350a2c4694cfd24c241c426d453d99f8620424b25ef1373ea5be06370c8199f3bd5a46f0ba1a4cd4b702a359efc969d5eaf1e9e78543c5900a  wasmtime-v24.0.0-src.tar.gz
diff --git a/pkg/contrib/src/wasmtime/version b/pkg/contrib/src/wasmtime/version
index 1debf1ff..d418b456 100644
--- a/pkg/contrib/src/wasmtime/version
+++ b/pkg/contrib/src/wasmtime/version
@@ -1 +1 @@
-WASMTIME_VERSION := 11.0.1
+WASMTIME_VERSION := 24.0.0
-- 
cgit