diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:03:05 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:03:05 +0000 |
commit | 217d9223a5aa75daf9f286fd1fc06dae379b5dbc (patch) | |
tree | b43bedae234ad56894a82934ee57e3619f3374d5 /debian/patches/d-bootstrap-old-cargo-compat.patch | |
parent | Adding upstream version 1.64.0+dfsg1. (diff) | |
download | rustc-217d9223a5aa75daf9f286fd1fc06dae379b5dbc.tar.xz rustc-217d9223a5aa75daf9f286fd1fc06dae379b5dbc.zip |
Adding debian version 1.64.0+dfsg1-1.debian/1.64.0+dfsg1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-bootstrap-old-cargo-compat.patch')
-rw-r--r-- | debian/patches/d-bootstrap-old-cargo-compat.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/debian/patches/d-bootstrap-old-cargo-compat.patch b/debian/patches/d-bootstrap-old-cargo-compat.patch new file mode 100644 index 000000000..e30d4a245 --- /dev/null +++ b/debian/patches/d-bootstrap-old-cargo-compat.patch @@ -0,0 +1,45 @@ +From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> +Date: Thu, 14 Jul 2022 13:17:39 +0200 +Subject: Backwards-compat for cargo 0.47 + + The flag being removed here was added in + https://github.com/rust-lang/cargo/pull/9404 released in cargo 0.54 + + This works around a feature introduced in this PR + https://github.com/rust-lang/cargo/pull/8640 released in cargo 0.53 + + Therefore it is not needed for Debian's current cargo 0.47. + + We can drop this patch when updating to cargo 0.54 and later. +--- + src/bootstrap/doc.rs | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs +index fb5395d..72eac7c 100644 +--- a/src/bootstrap/doc.rs ++++ b/src/bootstrap/doc.rs +@@ -446,7 +446,6 @@ impl Step for Std { + cargo + .arg("-p") + .arg(package) +- .arg("-Zskip-rustdoc-fingerprint") + .arg("--") + .arg("--markdown-css") + .arg("rust.css") +@@ -590,7 +589,6 @@ impl Step for Rustc { + cargo.rustdocflag("--generate-link-to-definition"); + compile::rustc_cargo(builder, &mut cargo, target); + cargo.arg("-Zunstable-options"); +- cargo.arg("-Zskip-rustdoc-fingerprint"); + + // Only include compiler crates, no dependencies of those, such as `libc`. + // Do link to dependencies on `docs.rs` however using `rustdoc-map`. +@@ -712,7 +710,6 @@ macro_rules! tool_doc { + &[], + ); + +- cargo.arg("-Zskip-rustdoc-fingerprint"); + // Only include compiler crates, no dependencies of those, such as `libc`. + cargo.arg("--no-deps"); + $( |