mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-misc/anki: clean up patches
* We no longer invoke the build system for running cargo-nextest since
5cd794. Now, I'm removing the corresponding patch in
ninja-rules-for-cargo.patch, which formerly prevented network access
in that scenario.
Fixes: 5cd7947a1b
Signed-off-by: Lucio Sauer <watermanpaint@posteo.net>
Part-of: https://github.com/gentoo/gentoo/pull/42917
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
@@ -2,9 +2,6 @@ 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
|
||||
@@ -18,23 +15,3 @@ From: Lucio Sauer <watermanpaint@posteo.net>
|
||||
}
|
||||
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);
|
||||
- build.add_inputs("", inputs![":cargo-nextest"]);
|
||||
build.add_env_var("ANKI_TEST_MODE", "1");
|
||||
build.add_output_stamp("tests/cargo_test");
|
||||
}
|
||||
|
||||
fn on_first_instance(&self, build: &mut Build) -> Result<()> {
|
||||
- build.add_action(
|
||||
- "cargo-nextest",
|
||||
- CargoInstall {
|
||||
- binary_name: "cargo-nextest",
|
||||
- args: "cargo-nextest --version 0.9.57 --locked",
|
||||
- },
|
||||
- )?;
|
||||
setup_flags(build)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user