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/rpm/Makefile.wasm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'pkg/rpm')

diff --git a/pkg/rpm/Makefile.wasm b/pkg/rpm/Makefile.wasm
index cb2ad35a..fe5c6808 100644
--- a/pkg/rpm/Makefile.wasm
+++ b/pkg/rpm/Makefile.wasm
@@ -6,13 +6,18 @@ MODULE_SUMMARY_wasm=	WASM module for NGINX Unit
 MODULE_VERSION_wasm=	$(VERSION)
 MODULE_RELEASE_wasm=	1
 
-MODULE_CONFARGS_wasm=	wasm --include-path=\`pwd\`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=\`pwd\`/pkg/contrib/wasmtime/target/release \&\& ./configure wasm-wasi-component
-MODULE_MAKEARGS_wasm=	wasm wasm-wasi-component CFLAGS=\"\$$(grep ^CFLAGS build/Makefile | cut -d' ' -f 3-) -Wno-missing-prototypes\"
-MODULE_INSTARGS_wasm=	wasm-install wasm-wasi-component-install
+MODULE_CONFARGS_wasm=	wasm-wasi-component
+MODULE_MAKEARGS_wasm=	wasm-wasi-component CFLAGS=\"\$$(grep ^CFLAGS build/Makefile | cut -d' ' -f 3-) -Wno-missing-prototypes\"
+MODULE_INSTARGS_wasm=	wasm-wasi-component-install
+
+ifeq (,$(findstring $(OSVER),amazonlinux2))
+MODULE_CONFARGS_wasm+=	\&\& ./configure wasm --include-path=\`pwd\`/pkg/contrib/wasmtime/artifacts/include --lib-path=\`pwd\`/pkg/contrib/wasmtime/artifacts/lib
+MODULE_MAKEARGS_wasm+=	wasm
+MODULE_INSTARGS_wasm+=	wasm-install
 
 MODULE_SOURCES_wasm=
 
-BUILD_DEPENDS_wasm=
+BUILD_DEPENDS_wasm=	cmake
 
 BUILD_DEPENDS+=		$(BUILD_DEPENDS_wasm)
 
@@ -22,16 +27,23 @@ endef
 export MODULE_PREBUILD_wasm
 
 define MODULE_PREINSTALL_wasm
+\# brp-mangle-shebangs parses all executable files for a shebang
+\# this fails on a vendored code that somehow ships with exec bit enabled
+find pkg/contrib/wasmtime/ -type f -executable -name "*.rs" | xargs chmod -x
 endef
 export MODULE_PREINSTALL_wasm
 
 define MODULE_POSTINSTALL_wasm
-%{__install} -m 755 -p pkg/contrib/wasmtime/target/release/libwasmtime.so %{buildroot}%{_libdir}/
+%{__install} -m 755 -p pkg/contrib/wasmtime/artifacts/lib/libwasmtime.so %{buildroot}%{_libdir}/
 endef
 export MODULE_POSTINSTALL_wasm
+endif
 
 define MODULE_FILES_wasm
+%if 0%{?amzn2}
+%else
 %{_libdir}/libwasmtime.so
+%endif
 %{_libdir}/unit/modules/*
 %{_libdir}/unit/debug-modules/*
 endef
-- 
cgit