summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-disable-git.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:37 +0000
commit2d0ec380bae2ec8d51b6193fee6577188c6bb2ec (patch)
tree00f9136b2844d7e9ddc861b845ccc309aaa6091a /debian/patches/d-bootstrap-disable-git.patch
parentMerging upstream version 1.70.0+dfsg1. (diff)
downloadrustc-2d0ec380bae2ec8d51b6193fee6577188c6bb2ec.tar.xz
rustc-2d0ec380bae2ec8d51b6193fee6577188c6bb2ec.zip
Adding debian version 1.70.0+dfsg1-7.debian/1.70.0+dfsg1-7
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.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/d-bootstrap-disable-git.patch b/debian/patches/d-bootstrap-disable-git.patch
index 3e744b599..6f7f3f2e4 100644
--- a/debian/patches/d-bootstrap-disable-git.patch
+++ b/debian/patches/d-bootstrap-disable-git.patch
@@ -15,7 +15,7 @@ Forwarded: not-needed
@@ -36,6 +36,12 @@
impl GitInfo {
- pub fn new(ignore_git: bool, dir: &Path) -> 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
@@ -27,7 +27,7 @@ Forwarded: not-needed
match read_commit_info_file(dir) {
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
-@@ -968,7 +968,10 @@
+@@ -995,7 +995,10 @@
}
// If we're building from git sources, we need to vendor a complete distribution.