Signed-off-by: Zhao Liu <zhao1....@intel.com>
---
scripts/archive-source.sh | 2 +-
scripts/make-release | 2 +-
subprojects/.gitignore | 1 +
.../packagefiles/thiserror-1-rs/meson.build | 23 +++++++++++++++++++
subprojects/thiserror-1-rs.wrap | 10 ++++++++
5 files changed, 36 insertions(+), 2 deletions(-)
create mode 100644 subprojects/packagefiles/thiserror-1-rs/meson.build
create mode 100644 subprojects/thiserror-1-rs.wrap
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index 8d8a0d37ecdc..3ae064f65263 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -31,7 +31,7 @@ subprojects="keycodemapdb libvfio-user berkeley-softfloat-3
bilge-impl-0.2-rs either-1-rs foreign-0.3-rs itertools-0.11-rs
libc-0.2-rs proc-macro2-1-rs
proc-macro-error-1-rs proc-macro-error-attr-1-rs quote-1-rs
- syn-2-rs thiserror-impl-1-rs unicode-ident-1-rs"
+ syn-2-rs thiserror-1-rs thiserror-impl-1-rs unicode-ident-1-rs"
sub_deinit=""
function cleanup() {
diff --git a/scripts/make-release b/scripts/make-release
index 3d3d8d4a51bc..73a14c12bdeb 100755
--- a/scripts/make-release
+++ b/scripts/make-release
@@ -44,7 +44,7 @@ SUBPROJECTS="libvfio-user keycodemapdb berkeley-softfloat-3
bilge-impl-0.2-rs either-1-rs foreign-0.3-rs itertools-0.11-rs
libc-0.2-rs proc-macro2-1-rs
proc-macro-error-1-rs proc-macro-error-attr-1-rs quote-1-rs
- syn-2-rs thiserror-impl-1-rs unicode-ident-1-rs"
+ syn-2-rs thiserror-1-rs thiserror-impl-1-rs unicode-ident-1-rs"
src="$1"
version="$2"
diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index e6ea570a2286..3b09ab42da08 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -19,5 +19,6 @@
/proc-macro2-1.0.84
/quote-1.0.36
/syn-2.0.66
+/thiserror-1.0.65
/thiserror-impl-1.0.65
/unicode-ident-1.0.12
diff --git a/subprojects/packagefiles/thiserror-1-rs/meson.build
b/subprojects/packagefiles/thiserror-1-rs/meson.build
new file mode 100644
index 000000000000..bfaf2f8d3eb8
--- /dev/null
+++ b/subprojects/packagefiles/thiserror-1-rs/meson.build
@@ -0,0 +1,23 @@
+project('thiserror-1-rs', 'rust',
+ meson_version: '>=1.5.0',
+ version: '1.0.65',
+ license: 'MIT OR Apache-2.0',
+ default_options: [])
+
+subproject('thiserror-impl-1-rs', required: true)
+thiserror_impl_rs = dependency('thiserror-impl-1-rs')
+
+_thiserror_rs = static_library(
+ 'thiserror',
+ files('src/lib.rs'),
+ gnu_symbol_visibility: 'hidden',
+ override_options: ['rust_std=2021', 'build.rust_std=2021'],
+ rust_abi: 'rust',
+ dependencies: [thiserror_impl_rs],
+)
+
+thiserror_dep = declare_dependency(
+ link_with: _thiserror_rs,
+)
+
+meson.override_dependency('thiserror-1-rs', thiserror_dep)
diff --git a/subprojects/thiserror-1-rs.wrap b/subprojects/thiserror-1-rs.wrap
new file mode 100644
index 000000000000..0f9303bebf97
--- /dev/null
+++ b/subprojects/thiserror-1-rs.wrap
@@ -0,0 +1,10 @@
+[wrap-file]
+directory = thiserror-1.0.65
+source_url = https://crates.io/api/v1/crates/thiserror/1.0.65/download
+source_filename = thiserror-1.0.65.tar.gz
+source_hash = 5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5
+#method = cargo
+patch_directory = thiserror-1-rs
+
+# bump this version number on every change to meson.build or the patches:
+# v2
--
2.34.1
