bootstrap: disable rust.download-rustc in tests

and rebase patches

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

debian/patches/build/bootstrap-don-t-attempt-to-download-rustc-in-tests.patch

@@ -0,0 +1,30 @@
+From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <debian@fabian.gruenbichler.email>
+Date: Sat, 11 Jan 2025 16:37:16 +0100
+Subject: bootstrap: don't attempt to download rustc in tests
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+the tests use a default config, so we need to manually override this
+option..
+
+Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
+---
+ src/bootstrap/src/core/config/config.rs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
+index 7c19ff1..8baa291 100644
+--- a/src/bootstrap/src/core/config/config.rs
++++ b/src/bootstrap/src/core/config/config.rs
+@@ -1435,6 +1435,10 @@ impl Config {
+             build.cargo = build.cargo.take().or(std::env::var_os("CARGO").map(|p| p.into()));
+             // Debian: don't optimize compiler-rt, the bundled sources are not available..
+             build.optimized_compiler_builtins = Some(false);
++
++            if let Some(ref mut rust) = toml.rust {
++                rust.download_rustc = Some(StringOrBool::Bool(false));
++            }
+         }
+ 
+         if let Some(include) = &toml.profile {

debian/patches/prune/d-0006-no-mimalloc.patch

@@ -5,8 +5,12 @@ Subject: d-0006-no-mimalloc
 Description: remove mimalloc(-sys)
 
 Forwarded: not-needed
+---
+ src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml | 1 -
+ 1 file changed, 1 deletion(-)
+
 diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-index 2dd2f2242a0..0e933b9f5c1 100644
+index 50a4bab..f63798d 100644
 --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
 @@ -35,7 +35,6 @@ rustc-hash.workspace = true

debian/patches/prune/d-0007-no-tzdb.patch

@@ -7,8 +7,12 @@ Description: remove jiff-tzdb(-platform)
 on Debian, we can just use the tzdata information..
 
 Forwarded: not-needed
+---
+ vendor/jiff-0.1.13/Cargo.toml | 1 -
+ 1 file changed, 1 deletion(-)
+
 diff --git a/vendor/jiff-0.1.13/Cargo.toml b/vendor/jiff-0.1.13/Cargo.toml
-index 323aa9c..5371d53 100644
+index 7ff813b..43b6e66 100644
 --- a/vendor/jiff-0.1.13/Cargo.toml
 +++ b/vendor/jiff-0.1.13/Cargo.toml
 @@ -122,7 +122,6 @@ alloc = []

debian/patches/prune/d-0020-remove-windows-dependencies.patch

@@ -355,10 +355,10 @@ index f823aa1..c82566f 100644
  cpu_profiler = []
  
 diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-index 50a4bab..6397b99 100644
+index f63798d..7a8a3f3 100644
 --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-@@ -71,9 +71,6 @@ vfs-notify.workspace = true
+@@ -70,9 +70,6 @@ vfs-notify.workspace = true
  vfs.workspace = true
  paths.workspace = true
  

debian/patches/prune/d-0021-vendor-remove-windows-dependencies.patch

@@ -546,10 +546,10 @@ index 41f2f56..32747ea 100644
  [badges.travis-ci]
  repository = "fitzgen/is_executable"
 diff --git a/vendor/jiff-0.1.13/Cargo.toml b/vendor/jiff-0.1.13/Cargo.toml
-index 7ff813b..323aa9c 100644
+index 43b6e66..5371d53 100644
 --- a/vendor/jiff-0.1.13/Cargo.toml
 +++ b/vendor/jiff-0.1.13/Cargo.toml
-@@ -134,7 +134,6 @@ serde = ["dep:serde"]
+@@ -133,7 +133,6 @@ serde = ["dep:serde"]
  std = ["alloc"]
  tz-system = [
      "std",
@@ -557,7 +557,7 @@ index 7ff813b..323aa9c 100644
  ]
  tzdb-bundle-always = [
      "dep:jiff-tzdb",
-@@ -160,12 +159,3 @@ optional = true
+@@ -159,12 +158,3 @@ optional = true
  
  [target.'cfg(not(target_family = "wasm"))'.dev-dependencies.hifitime]
  version = "3.9.0"

debian/patches/series

@@ -44,3 +44,4 @@ build/disable-broken-i386-tests.patch
 build/ignore-broken-debuginfo-tests.patch
 vendor/blake3-skip-embedded-C-code-use-pure-implementation.patch
 build/ci_rustc-disable-test-that-requires-upstream-git-repo.patch
+build/bootstrap-don-t-attempt-to-download-rustc-in-tests.patch