diff --git a/testing/wasmtime/APKBUILD b/testing/wasmtime/APKBUILD index 6f72b6c8daa..a23004a22b1 100644 --- a/testing/wasmtime/APKBUILD +++ b/testing/wasmtime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Patrycja Rosa # Maintainer: Patrycja Rosa pkgname=wasmtime -pkgver=8.0.1 +pkgver=9.0.1 pkgrel=0 pkgdesc="Fast and secure runtime for WebAssembly" url="https://wasmtime.dev/" @@ -23,11 +23,21 @@ options="!check net" prepare() { default_prepare - git init + git init -q # can't patch deps with vendor dir rm -fv .cargo/config.toml rm -rf vendor + # Rust target triple. + local target=$(rustc -vV | sed -n 's/host: //p') + + # Build against system-provided libs + mkdir -p .cargo + cat >> .cargo/config.toml <<-EOF + [target.$target] + zstd = { rustc-link-lib = ["zstd"] } + EOF + cargo fetch --target="$CTARGET" --locked } @@ -51,6 +61,6 @@ libwasmtime() { } sha512sums=" -bfead926c77888bc9530a2ad0c41217e19c1e45aa0b9a6207a8307c707c8b1321e305f175b5466af36f65adc2b8ae48c0654e4dc6a88b8c0796ba4603f18e7cc wasmtime-v8.0.1-src.tar.gz -931620c9109cf9a5554191dcf322c5b3ee0c1934c06ed26812a64ed7cd041b019086f7608ccd3c48acdd21f316f72dc2f9c44ac825a6736e4a4e79abc3fcc225 system-zstd.patch +1e0ca739485334897faa4f9e532b078ec835271ebd67b8ffb846eef2b57af08daa1b2cf1da6b0f27b721626f7770859a2cb0a1aef0191b982f4dca7de2d98e77 wasmtime-v9.0.1-src.tar.gz +5441687022cee3a4774052cf81aef786bfb6385f0474c13964320c529b9f82128063f088c6a6e3e3f2883b592b118f13e0dacb309697d0e8d8e2d9670e33bba7 system-zstd.patch " diff --git a/testing/wasmtime/system-zstd.patch b/testing/wasmtime/system-zstd.patch index 6ee2a69561e..7dbdf11eebb 100644 --- a/testing/wasmtime/system-zstd.patch +++ b/testing/wasmtime/system-zstd.patch @@ -1,8 +1,8 @@ diff --git a/Cargo.lock b/Cargo.lock -index 36182b4..ab8535c 100644 +index f5a3e5e..dc23e54 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -2086,6 +2086,12 @@ dependencies = [ +@@ -2272,6 +2272,12 @@ dependencies = [ "zeroize", ] @@ -15,7 +15,7 @@ index 36182b4..ab8535c 100644 [[package]] name = "plotters" version = "0.3.1" -@@ -4227,18 +4233,18 @@ dependencies = [ +@@ -4641,18 +4647,18 @@ dependencies = [ [[package]] name = "zstd" @@ -38,7 +38,7 @@ index 36182b4..ab8535c 100644 dependencies = [ "libc", "zstd-sys", -@@ -4246,10 +4252,11 @@ dependencies = [ +@@ -4660,10 +4666,11 @@ dependencies = [ [[package]] name = "zstd-sys"