diff options
Diffstat (limited to '')
-rw-r--r-- | debian/patches/prune/d-0000-ignore-removed-submodules.patch (renamed from debian/patches/d-0000-ignore-removed-submodules.patch) | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/prune/d-0000-ignore-removed-submodules.patch index 2ca3804d4..f3a7b7030 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/prune/d-0000-ignore-removed-submodules.patch @@ -2,6 +2,10 @@ From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> Date: Sat, 2 Oct 2021 01:07:59 +0100 Subject: d-0000-ignore-removed-submodules +Description: remove upstream parts that are not needed for the Debian build, in +order to both reduce the orig tarball and the vendored crates within. + +Forwarded: not-needed --- Cargo.toml | 7 ---- src/bootstrap/bootstrap.py | 4 --- @@ -38,10 +42,10 @@ index 9b11ae8..19a98f9 100644 "src/tools/lld-wrapper", "src/tools/collect-license-metadata", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index 5a84e37..9bb09a6 100644 +index fea194a..ed99a47 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -969,10 +969,6 @@ class RustBuild(object): +@@ -955,10 +955,6 @@ class RustBuild(object): args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] args.extend("--verbose" for _ in range(self.verbose)) @@ -53,10 +57,10 @@ index 5a84e37..9bb09a6 100644 args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs -index d2aa89d..1ea2d93 100644 +index 4eb7766..5c115cf 100644 --- a/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs -@@ -2278,17 +2278,7 @@ impl Step for RustcGuide { +@@ -2295,17 +2295,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -76,11 +80,11 @@ index d2aa89d..1ea2d93 100644 } diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs -index cd27667..2c870e9 100644 +index e180964..7245d11 100644 --- a/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder.rs @@ -498,20 +498,20 @@ impl<'a> ShouldRun<'a> { - static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new(); + static SUBMODULES_PATHS: OnceLock<Vec<String>> = OnceLock::new(); let init_submodules_paths = |src: &PathBuf| { - let file = File::open(src.join(".gitmodules")).unwrap(); @@ -175,7 +179,7 @@ index cd27667..2c870e9 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -823,12 +804,9 @@ impl<'a> Builder<'a> { +@@ -824,12 +805,9 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -188,7 +192,7 @@ index cd27667..2c870e9 100644 dist::LlvmTools, dist::RustDev, dist::Bootstrap, -@@ -845,11 +823,9 @@ impl<'a> Builder<'a> { +@@ -846,11 +824,9 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -200,7 +204,7 @@ index cd27667..2c870e9 100644 install::LlvmTools, install::Src, install::Rustc -@@ -859,7 +835,6 @@ impl<'a> Builder<'a> { +@@ -860,7 +836,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, @@ -208,7 +212,7 @@ index cd27667..2c870e9 100644 run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, -@@ -2045,10 +2020,7 @@ impl<'a> Builder<'a> { +@@ -2080,10 +2055,7 @@ impl<'a> Builder<'a> { } } @@ -221,7 +225,7 @@ index cd27667..2c870e9 100644 } diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml -index cab88fc..5bac437 100644 +index 1213979..71f9aa7 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -1,5 +1,14 @@ |