diff options
Diffstat (limited to 'app-misc')
| -rw-r--r-- | app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch (renamed from app-misc/anki/files/23.12.1/use-system-nextest.patch) | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/app-misc/anki/files/23.12.1/use-system-nextest.patch b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch index 8f931b97da86..cf9356bbc24c 100644 --- a/app-misc/anki/files/23.12.1/use-system-nextest.patch +++ b/app-misc/anki/files/23.12.1/ninja-rules-for-cargo.patch @@ -1,10 +1,24 @@ -Provide the binary ourselves to prevent network access. +Fix the output path for Rust binaries in the Ninja file to match +Cargo's target directory when CARGO_BUILD_TARGET is set. This prevents +file-not-found errors for some build steps. + +Provide the cargo-nextest binary ourselves to prevent network access. Set test runner options in the ebuild. From: Lucio Sauer <watermanpaint@posteo.net> --- a/build/ninja_gen/src/cargo.rs +++ b/build/ninja_gen/src/cargo.rs -@@ -152,19 +152,11 @@ impl BuildAction for CargoTest { +@@ -61,6 +61,9 @@ impl RustOutput<'_> { + let mut path: Utf8PathBuf = rust_base.into(); + if let Some(target) = target { + path = path.join(target); ++ } else { ++ let triple = std::env::var("CARGO_BUILD_TARGET").unwrap_or_default(); ++ path = path.join(triple); + } + path = path.join(profile_output_dir(build_profile)).join(filename); + path.to_string() +@@ -152,19 +155,11 @@ impl BuildAction for CargoTest { fn files(&mut self, build: &mut impl FilesHandle) { build.add_inputs("", &self.inputs); |