bump wasmtime to v24

Signed-off-by: Ava Hahn <[email protected]>
nginx · Aug 28, 2024 · ecc254a · ecc254a
1 parent cff18f8
commit ecc254a
Show file tree

Hide file tree

Showing 7 changed files with 346 additions and 302 deletions.
diff --git a/docs/changes.xml b/docs/changes.xml
@@ -29,6 +29,11 @@ NGINX Unit updated to 1.33.0.
 
 </changes>
 
+<change>
+<para>
+wasm and wasm-wasi-component now built against libwasmtime 24.0.0
+</para>
+</change>
 
 <changes apply="unit" ver="1.33.0" rev="1"
          date="" time=""

diff --git a/pkg/contrib/src/wasmtime/Makefile b/pkg/contrib/src/wasmtime/Makefile
@@ -11,6 +11,12 @@ else
 CARGO = $(error Cargo (Rust package manager) not found)
 endif
 
+ifeq ($(shell which cmake >/dev/null 2>&1 || echo FAIL),)
+CMAKE = cmake
+else
+cmake = $(error Cmake not found)
+endif
+
 ifeq ($(shell uname -s),Linux)
 WASMTIME_ARGS=-Clink-arg=-Wl,-soname,libwasmtime.so
 endif
@@ -26,5 +32,5 @@ wasmtime: wasmtime-v$(WASMTIME_VERSION)-src.tar.gz .sum-wasmtime
 
 .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 $< && cd crates/c-api && $(CMAKE) .
 	touch $@
diff --git 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
@@ -1 +1 @@
-WASMTIME_VERSION := 11.0.1
+WASMTIME_VERSION := 24.0.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4b67ba0742da0558efffe1dbde5512dc5f0201fad25f1027d277758e76778b2add11528dbe3f5b7759f2386859b52aea3a0526abaa481c2ed91eb56c5a531b49 wasmtime-v11.0.1-src.tar.gz
		2ce3979f772176350a2c4694cfd24c241c426d453d99f8620424b25ef1373ea5be06370c8199f3bd5a46f0ba1a4cd4b702a359efc969d5eaf1e9e78543c5900a wasmtime-v24.0.0-src.tar.gz
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		WASMTIME_VERSION := 11.0.1
		WASMTIME_VERSION := 24.0.0