summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Lemasle <o.lemasle@gmail.com>2021-07-03 20:04:51 +0200
committerOlivier Lemasle <o.lemasle@gmail.com>2021-07-03 20:04:51 +0200
commit40a86c88be584155b05017834e2ade272c550f01 (patch)
tree8e1f505879049ec3ede45d6ca43e1ae39e2a3692
parent18f70665a2b9fe519a462e7c6ec7795c8a49de50 (diff)
downloadwasmtime-copr-40a86c88be584155b05017834e2ade272c550f01.tar.gz
wasmtime-copr-40a86c88be584155b05017834e2ade272c550f01.tar.xz
wasmtime-copr-40a86c88be584155b05017834e2ade272c550f01.zip
Use latest cargo-c
-rw-r--r--patch-c-api-cargo.diff2
-rw-r--r--wasmtime.spec15
2 files changed, 6 insertions, 11 deletions
diff --git a/patch-c-api-cargo.diff b/patch-c-api-cargo.diff
index 8731aa0..f7b22f3 100644
--- a/patch-c-api-cargo.diff
+++ b/patch-c-api-cargo.diff
@@ -16,3 +16,5 @@ diff --color -Naur wasmtime-0.28.0/crates/c-api/Cargo.toml wasmtime-0.28.0/crate
+
+[package.metadata.capi.header]
+generation = false
++[package.metadata.capi.install.include]
++asset = [{from = "include/**/*"}, {from = "wasm-c-api/include/*.h"}]
diff --git a/wasmtime.spec b/wasmtime.spec
index dc89db8..c5d7158 100644
--- a/wasmtime.spec
+++ b/wasmtime.spec
@@ -8,7 +8,7 @@
Name: wasmtime
Version: 0.28.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Standalone JIT-style runtime for WebAssembly, using Cranelift
License: ASL 2.0 with exceptions
@@ -60,10 +60,6 @@ tar zxf %{SOURCE3} --strip-components=1 -C crates/wasi-crypto/spec
tar zxf %{SOURCE4} --strip-components=1 -C crates/wasi-nn/spec
tar zxf %{SOURCE5} --strip-components=1 -C tests/spec_testsuite
-# Move a header file in assets directory (will be overriden later)
-mkdir crates/c-api/assets
-cp crates/c-api/include/wasmtime.h crates/c-api/assets
-
# Configure cargo
mkdir -p .cargo
cat > .cargo/config << EOF
@@ -103,12 +99,6 @@ cargo cinstall --release --manifest-path crates/c-api/Cargo.toml \
rm -v %{buildroot}%{_libdir}/libwasmtime.a
# Remove source
rm -rf %{buildroot}%{cargo_registry}/wasmtime-cli-%{version}
-# Install header files
-install -dp %{buildroot}%{_includedir}/wasmtime
-install -p crates/c-api/include/*.h %{buildroot}%{_includedir}/wasmtime
-install -dp %{buildroot}%{_includedir}/wasmtime/wasmtime
-install -p crates/c-api/include/wasmtime/*.h %{buildroot}%{_includedir}/wasmtime/wasmtime
-install -p crates/c-api/wasm-c-api/include/*.h %{buildroot}%{_includedir}/wasmtime
# Man page
install -d .%{_mandir}/man1
help2man --no-info %{buildroot}%{_bindir}/wasmtime > wasmtime.man
@@ -138,6 +128,9 @@ install -p -m 644 -D wasmtime.man %{buildroot}%{_mandir}/man1/wasmtime.1
%{_libdir}/pkgconfig/wasmtime.pc
%changelog
+* Sat Jul 03 2021 Olivier Lemasle <o.lemasle@gmail.com> - 0.28.0-2
+- Use latest cargo-c (0.9.0)
+
* Sun Jun 27 2021 Olivier Lemasle <o.lemasle@gmail.com> - 0.28.0-1
- Initial package