host/start-vmm: use meson -rs convention for deps

Meson has now standardised on Rust library dependencies having names
ending in "-rs", so we should do that too.  It'll make it easier to
use Cargo wraps later.

Signed-off-by: Alyssa Ross <hi@alyssa.is>

15 files changed, 44 insertions, 23 deletions

diff --git a/host/start-vmm/meson.build b/host/start-vmm/meson.build
index 564be1b..0af63a3 100644
--- a/host/start-vmm/meson.build
+++ b/host/start-vmm/meson.build
@@ -6,7 +6,7 @@ project('start-vmm', 'rust', 'c',
 
 add_project_arguments('-D_GNU_SOURCE', '-Wno-error=attributes', language : 'c')
 
-miniserde_dep = dependency('miniserde')
+miniserde_dep = dependency('miniserde-rs')
 
 c_lib = static_library('start-vmm', 'fork.c', 'net.c', 'net-util.c', 'unix.c')
 rust_lib = static_library('start_vmm', 'lib.rs',
diff --git a/host/start-vmm/subprojects/itoa.wrap b/host/start-vmm/subprojects/itoa.wrap
index ce662df..dd089f7 100644
--- a/host/start-vmm/subprojects/itoa.wrap
+++ b/host/start-vmm/subprojects/itoa.wrap
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
 
 [wrap-file]
 directory = itoa-1.0.10
@@ -7,3 +7,6 @@ source_url = https://crates.io/api/v1/crates/itoa/1.0.10/download
 source_filename = itoa-1.0.10.tar.gz
 source_hash = b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c
 patch_directory = itoa
+
+[provide]
+dependency_names = itoa-rs
diff --git a/host/start-vmm/subprojects/miniserde.wrap b/host/start-vmm/subprojects/miniserde.wrap
index 50875bf..111960f 100644
--- a/host/start-vmm/subprojects/miniserde.wrap
+++ b/host/start-vmm/subprojects/miniserde.wrap
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
 
 # The GitHub archive is used so that mini_internal is included,
 # and can be built with the same meson.build,
@@ -11,3 +11,6 @@ source_filename = miniserde-0.1.38.tar.gz
 source_hash = 4264f8d0e44463b8bc4ff43d9a8be4ea00fac6c56195e8f19e316b8fce9de132
 depth = 1
 patch_directory = miniserde
+
+[provide]
+dependency_names = miniserde-rs
diff --git a/host/start-vmm/subprojects/packagefiles/itoa/meson.build b/host/start-vmm/subprojects/packagefiles/itoa/meson.build
index eeb2cf6..0e4cd40 100644
--- a/host/start-vmm/subprojects/packagefiles/itoa/meson.build
+++ b/host/start-vmm/subprojects/packagefiles/itoa/meson.build
@@ -7,4 +7,4 @@ itoa = static_library('itoa', 'src/lib.rs', rust_crate_type : 'rlib')
 
 itoa_dep = declare_dependency(link_with : itoa)
 
-meson.override_dependency('itoa', itoa_dep)
+meson.override_dependency('itoa-rs', itoa_dep)
diff --git a/host/start-vmm/subprojects/packagefiles/miniserde/meson.build b/host/start-vmm/subprojects/packagefiles/miniserde/meson.build
index 838b872..8502b01 100644
--- a/host/start-vmm/subprojects/packagefiles/miniserde/meson.build
+++ b/host/start-vmm/subprojects/packagefiles/miniserde/meson.build
@@ -4,8 +4,8 @@
 project('miniserde', 'rust', version : '0.1.38',
   default_options : ['build.rust_std=2021', 'rust_std=2021'])
 
-quote_dep = dependency('quote', native : true)
-syn_dep = dependency('syn', native : true)
+quote_dep = dependency('quote-rs', native : true)
+syn_dep = dependency('syn-rs', native : true)
 
 mini_internal = shared_library('mini_internal', 'derive/src/lib.rs',
   dependencies : [quote_dep, syn_dep],
@@ -13,8 +13,8 @@ mini_internal = shared_library('mini_internal', 'derive/src/lib.rs',
   rust_args : ['-C', 'panic=unwind'],
   rust_crate_type : 'proc-macro')
 
-itoa_dep = dependency('itoa')
-ryu_dep = dependency('ryu')
+itoa_dep = dependency('itoa-rs')
+ryu_dep = dependency('ryu-rs')
 
 miniserde = static_library('miniserde', 'src/lib.rs',
   dependencies : [itoa_dep, ryu_dep],
@@ -25,4 +25,4 @@ miniserde_dep = declare_dependency(
   dependencies : [itoa_dep, ryu_dep],
   link_with : miniserde)
 
-meson.override_dependency('miniserde', miniserde_dep)
+meson.override_dependency('miniserde-rs', miniserde_dep)
diff --git a/host/start-vmm/subprojects/packagefiles/proc-macro2/meson.build b/host/start-vmm/subprojects/packagefiles/proc-macro2/meson.build
index 1e29ed4..dbc5d3b 100644
--- a/host/start-vmm/subprojects/packagefiles/proc-macro2/meson.build
+++ b/host/start-vmm/subprojects/packagefiles/proc-macro2/meson.build
@@ -4,7 +4,7 @@
 project('proc-macro2', 'rust', version : '1.0.78',
   default_options : ['build.rust_std=2021', 'rust_std=2021'])
 
-unicode_ident_dep = dependency('unicode-ident', native : true)
+unicode_ident_dep = dependency('unicode-ident-rs', native : true)
 
 proc_macro2 = static_library('proc_macro2', 'src/lib.rs',
   dependencies : unicode_ident_dep,
@@ -16,4 +16,4 @@ proc_macro2_dep = declare_dependency(
   dependencies : unicode_ident_dep,
   link_with : proc_macro2)
 
-meson.override_dependency('proc-macro2', proc_macro2_dep, native : true)
+meson.override_dependency('proc-macro2-rs', proc_macro2_dep, native : true)
diff --git a/host/start-vmm/subprojects/packagefiles/quote/meson.build b/host/start-vmm/subprojects/packagefiles/quote/meson.build
index 4a003d8..a5dd8e6 100644
--- a/host/start-vmm/subprojects/packagefiles/quote/meson.build
+++ b/host/start-vmm/subprojects/packagefiles/quote/meson.build
@@ -4,7 +4,7 @@
 project('quote', 'rust', version : '1.0.35',
   default_options : ['build.rust_std=2018', 'rust_std=2018'])
 
-proc_macro2_dep = dependency('proc-macro2', native : true)
+proc_macro2_dep = dependency('proc-macro2-rs', native : true)
 
 quote = static_library('quote', 'src/lib.rs',
   dependencies : proc_macro2_dep,
@@ -16,4 +16,4 @@ quote_dep = declare_dependency(
   dependencies : proc_macro2_dep,
   link_with : quote)
 
-meson.override_dependency('quote', quote_dep, native : true)
+meson.override_dependency('quote-rs', quote_dep, native : true)
diff --git a/host/start-vmm/subprojects/packagefiles/ryu/meson.build b/host/start-vmm/subprojects/packagefiles/ryu/meson.build
index a7ca612..0c4b8f9 100644
--- a/host/start-vmm/subprojects/packagefiles/ryu/meson.build
+++ b/host/start-vmm/subprojects/packagefiles/ryu/meson.build
@@ -7,4 +7,4 @@ ryu = static_library('ryu', 'src/lib.rs', rust_crate_type : 'rlib')
 
 ryu_dep = declare_dependency(link_with : ryu)
 
-meson.override_dependency('ryu', ryu_dep)
+meson.override_dependency('ryu-rs', ryu_dep)
diff --git a/host/start-vmm/subprojects/packagefiles/syn/meson.build b/host/start-vmm/subprojects/packagefiles/syn/meson.build
index 60ea88f..509119a 100644
--- a/host/start-vmm/subprojects/packagefiles/syn/meson.build
+++ b/host/start-vmm/subprojects/packagefiles/syn/meson.build
@@ -4,8 +4,8 @@
 project('syn', 'rust', version : '2.0.41',
   default_options : ['build.rust_std=2021', 'rust_std=2021'])
 
-proc_macro2_dep = dependency('proc-macro2', native : true)
-quote_dep = dependency('quote', native : true)
+proc_macro2_dep = dependency('proc-macro2-rs', native : true)
+quote_dep = dependency('quote-rs', native : true)
 
 syn = static_library('syn', 'src/lib.rs',
   dependencies : [proc_macro2_dep, quote_dep],
@@ -24,4 +24,4 @@ syn_dep = declare_dependency(
   dependencies : [proc_macro2_dep, quote_dep],
   link_with : syn)
 
-meson.override_dependency('syn', syn_dep, native : true)
+meson.override_dependency('syn-rs', syn_dep, native : true)
diff --git a/host/start-vmm/subprojects/packagefiles/unicode-ident/meson.build b/host/start-vmm/subprojects/packagefiles/unicode-ident/meson.build
index 7146ec4..ce5bf81 100644
--- a/host/start-vmm/subprojects/packagefiles/unicode-ident/meson.build
+++ b/host/start-vmm/subprojects/packagefiles/unicode-ident/meson.build
@@ -11,4 +11,4 @@ unicode_ident = static_library('unicode_ident', 'src/lib.rs',
 
 unicode_ident_dep = declare_dependency(link_with : unicode_ident)
 
-meson.override_dependency('unicode-ident', unicode_ident_dep, native : true)
+meson.override_dependency('unicode-ident-rs', unicode_ident_dep, native : true)
diff --git a/host/start-vmm/subprojects/proc-macro2.wrap b/host/start-vmm/subprojects/proc-macro2.wrap
index f8dd29e..ceedc9f 100644
--- a/host/start-vmm/subprojects/proc-macro2.wrap
+++ b/host/start-vmm/subprojects/proc-macro2.wrap
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
 
 [wrap-file]
 directory = proc-macro2-1.0.78
@@ -7,3 +7,6 @@ source_url = https://crates.io/api/v1/crates/proc-macro2/1.0.78/download
 source_filename = proc-macro2-1.0.78.tar.gz
 source_hash = e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae
 patch_directory = proc-macro2
+
+[provide]
+dependency_names = proc-macro2-rs
diff --git a/host/start-vmm/subprojects/quote.wrap b/host/start-vmm/subprojects/quote.wrap
index cdbd3cc..d2fe29e 100644
--- a/host/start-vmm/subprojects/quote.wrap
+++ b/host/start-vmm/subprojects/quote.wrap
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
 
 [wrap-file]
 directory = quote-1.0.35
@@ -7,3 +7,6 @@ source_url = https://crates.io/api/v1/crates/quote/1.0.35/download
 source_filename = quote-1.0.35.tar.gz
 source_hash = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
 patch_directory = quote
+
+[provide]
+dependency_names = quote-rs
diff --git a/host/start-vmm/subprojects/ryu.wrap b/host/start-vmm/subprojects/ryu.wrap
index 07fa27f..259ee5a 100644
--- a/host/start-vmm/subprojects/ryu.wrap
+++ b/host/start-vmm/subprojects/ryu.wrap
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
 
 [wrap-file]
 directory = ryu-1.0.17
@@ -7,3 +7,6 @@ source_url = https://crates.io/api/v1/crates/ryu/1.0.17/download
 source_filename = ryu-1.0.17.tar.gz
 source_hash = e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1
 patch_directory = ryu
+
+[provide]
+dependency_names = ryu-rs
diff --git a/host/start-vmm/subprojects/syn.wrap b/host/start-vmm/subprojects/syn.wrap
index f01014a..d11e7b0 100644
--- a/host/start-vmm/subprojects/syn.wrap
+++ b/host/start-vmm/subprojects/syn.wrap
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
 
 [wrap-file]
 directory = syn-2.0.41
@@ -7,3 +7,6 @@ source_url = https://crates.io/api/v1/crates/syn/2.0.41/download
 source_filename = syn-2.0.41.tar.gz
 source_hash = 44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269
 patch_directory = syn
+
+[provide]
+dependency_names = syn-rs
\ No newline at end of file
diff --git a/host/start-vmm/subprojects/unicode-ident.wrap b/host/start-vmm/subprojects/unicode-ident.wrap
index e6ed206..f3db845 100644
--- a/host/start-vmm/subprojects/unicode-ident.wrap
+++ b/host/start-vmm/subprojects/unicode-ident.wrap
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: CC0-1.0
-# SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2023-2024 Alyssa Ross <hi@alyssa.is>
 
 [wrap-file]
 directory = unicode-ident-1.0.12
@@ -7,3 +7,6 @@ source_url = https://crates.io/api/v1/crates/unicode-ident/1.0.12/download
 source_filename = unicode-ident-1.0.12.tar.gz
 source_hash = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
 patch_directory = unicode-ident
+
+[provide]
+dependency_names = unicode-ident-rs