diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-08-25 15:24:30 +0200 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2025-10-29 11:34:19 -0700 |
| commit | adf9f344a7066458fe33faca62654fc73a67620a (patch) | |
| tree | f6067987e6bb07ddc71c518da94bbaa988eecd64 /test cases | |
| parent | 06a9a6d1d3f9941fd3748598f5443e9695bee073 (diff) | |
| download | meson-adf9f344a7066458fe33faca62654fc73a67620a.tar.gz | |
cargo: only create dependencies if there is a [lib] table
In the long term, dependencies that do not have a [lib] table will not
create an invocation of override_dependency; do not expect there to be
a handwritten meson.build that does it.
In particular, this is the case for extra-dep-1-rs in the "rust/22 cargo
subproject" test case, so change that to use the extra_deps mechanism
instead to invoke the subproject.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'test cases')
3 files changed, 4 insertions, 9 deletions
diff --git a/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/Cargo.toml b/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/Cargo.toml deleted file mode 100644 index 4b6fa5777..000000000 --- a/test cases/rust/22 cargo subproject/subprojects/extra-dep-1-rs/Cargo.toml +++ /dev/null @@ -1,3 +0,0 @@ -[package] -name = "extra-deps" -version = "1.0" diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml index d1fc74af8..9dc346030 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml +++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/Cargo.toml @@ -12,11 +12,6 @@ path = "lib.rs" optional = true version = "1.0" -# This dependency is optional but required for f3 which is on by default. -[dependencies.extra-dep] -optional = true -version = "1.0" - [dependencies] mybar = { version = "0.1", package = "bar", default-features = false } @@ -34,5 +29,5 @@ version = "0.1" default = ["f1"] f1 = ["f2", "f3"] f2 = ["f1"] -f3 = ["mybar/f1", "dep:extra-dep", "notfound?/invalid"] +f3 = ["mybar/f1", "notfound?/invalid"] f4 = ["dep:notfound"] diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/meson/meson.build b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/meson/meson.build index 67c7b82f9..84bd066e9 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/meson/meson.build +++ b/test cases/rust/22 cargo subproject/subprojects/foo-0-rs/meson/meson.build @@ -1 +1,4 @@ extra_args += ['--cfg', 'feature="foo"'] +if 'f3' in features + extra_deps += dependency('extra-dep-1-rs', fallback: 'extra-dep-1-rs') +endif |