blob: 4cd8bc1cdab124603c8a245c348c99d9012fae40 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From: Matthijs van Otterdijk <matthijs@wirevirt.net>
Date: Thu, 14 Jul 2022 13:17:38 +0200
Subject: Don't check for cargo-vendor when building from (Debian's) git
Forwarded: not-needed
Forwarded: not-needed
---
src/bootstrap/channel.rs | 6 +++++-
src/bootstrap/dist.rs | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
Index: rust/src/bootstrap/channel.rs
===================================================================
--- rust.orig/src/bootstrap/channel.rs
+++ rust/src/bootstrap/channel.rs
@@ -36,6 +36,12 @@ pub struct Info {
impl GitInfo {
pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo {
+ //
+ // Debian: returning early because the Debian package is also in a git
+ // repository, but we don't want to parse gitinfo. This is
+ // needed for the bootstrap tests to work which running for
+ // Debian git.
+ return GitInfo::Absent;
// See if this even begins to look like a git dir
if !dir.join(".git").exists() {
match read_commit_info_file(dir) {
Index: rust/src/bootstrap/dist.rs
===================================================================
--- rust.orig/src/bootstrap/dist.rs
+++ rust/src/bootstrap/dist.rs
@@ -997,7 +997,10 @@ impl Step for PlainSourceTarball {
}
// If we're building from git sources, we need to vendor a complete distribution.
- if builder.rust_info().is_managed_git_subrepository() {
+ //
+ // Debian: short-circuited because the Debian package is also in a git
+ // repository, but cargo-vendor should not be installed or run.
+ if false && builder.rust_info().is_managed_git_subrepository() {
// Ensure we have the submodules checked out.
builder.update_submodule(Path::new("src/tools/cargo"));
builder.update_submodule(Path::new("src/tools/rust-analyzer"));
|
