diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:40 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:40 +0000 |
| commit | b667bd04d7a0062c0e3fc07f480f5d66c55c0014 (patch) | |
| tree | ae99acd0647b6bcb5fe608adaa66995139eb146e /debian/patches/d-bootstrap-disable-git.patch | |
| parent | Merging upstream version 1.70.0+dfsg1. (diff) | |
| download | rustc-b667bd04d7a0062c0e3fc07f480f5d66c55c0014.tar.xz rustc-b667bd04d7a0062c0e3fc07f480f5d66c55c0014.zip | |
Merging debian version 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.patch | 4 |
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. |