summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-disable-git.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-19 09:26:01 +0000
commitc29d7c1ba10d6debd11f9d8aad5d069a6491e60e (patch)
treea2ad46eb513b315f0efd8170af5eb08870165757 /debian/patches/d-bootstrap-disable-git.patch
parentMerging upstream version 1.76.0+dfsg1. (diff)
downloadrustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.tar.xz
rustc-c29d7c1ba10d6debd11f9d8aad5d069a6491e60e.zip
Adding debian version 1.76.0+dfsg1-1.debian/1.76.0+dfsg1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-bootstrap-disable-git.patch')
-rw-r--r--debian/patches/d-bootstrap-disable-git.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/debian/patches/d-bootstrap-disable-git.patch b/debian/patches/d-bootstrap-disable-git.patch
deleted file mode 100644
index bd2c75946..000000000
--- a/debian/patches/d-bootstrap-disable-git.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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/src/utils/channel.rs
-===================================================================
---- rust.orig/src/bootstrap/src/utils/channel.rs
-+++ rust/src/bootstrap/src/utils/channel.rs
-@@ -35,6 +35,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/src/core/build_steps/dist.rs
-===================================================================
---- rust.orig/src/bootstrap/src/core/build_steps/dist.rs
-+++ rust/src/bootstrap/src/core/build_steps/dist.rs
-@@ -991,8 +991,10 @@ impl Step for PlainSourceTarball {
-
- // If we're building from git or tarball sources, we need to vendor
- // a complete distribution.
-- if builder.rust_info().is_managed_git_subrepository()
-- || builder.rust_info().is_from_tarball()
-+ //
-+ // Debian: short-circuited because the Debian package is also in a git
-+ // repository, but cargo-vendor should not be installed or run.
-+ if false
- {
- if builder.rust_info().is_managed_git_subrepository() {
- // Ensure we have the submodules checked out.