summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-bootstrap-old-cargo-compat.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:41:39 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:41:39 +0000
commita5cb27bed2202818ee204db23f8488a7794d6ec3 (patch)
tree4a38fb6c257e5031269038e525d11a7c2f0fdb1b /debian/patches/d-bootstrap-old-cargo-compat.patch
parentMerging upstream version 1.70.0+dfsg2. (diff)
downloadrustc-a5cb27bed2202818ee204db23f8488a7794d6ec3.tar.xz
rustc-a5cb27bed2202818ee204db23f8488a7794d6ec3.zip
Adding debian version 1.70.0+dfsg2-1.debian/1.70.0+dfsg2-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.patch12
1 files changed, 7 insertions, 5 deletions
diff --git a/debian/patches/d-bootstrap-old-cargo-compat.patch b/debian/patches/d-bootstrap-old-cargo-compat.patch
index a077e0c8f..0dacb4521 100644
--- a/debian/patches/d-bootstrap-old-cargo-compat.patch
+++ b/debian/patches/d-bootstrap-old-cargo-compat.patch
@@ -15,9 +15,11 @@ Subject: Backwards-compat for cargo 0.47
src/bootstrap/doc.rs | 3 ---
1 file changed, 3 deletions(-)
---- a/src/bootstrap/doc.rs
-+++ b/src/bootstrap/doc.rs
-@@ -612,7 +612,6 @@
+Index: rust/src/bootstrap/doc.rs
+===================================================================
+--- rust.orig/src/bootstrap/doc.rs
++++ rust/src/bootstrap/doc.rs
+@@ -613,7 +613,6 @@ fn doc_std(
.arg(&*target_dir.to_string_lossy())
.arg("-p")
.arg(package)
@@ -25,7 +27,7 @@ Subject: Backwards-compat for cargo 0.47
.arg("--")
.arg("-Z")
.arg("unstable-options")
-@@ -712,7 +711,6 @@
+@@ -713,7 +712,6 @@ impl Step for Rustc {
cargo.rustdocflag("--generate-link-to-definition");
compile::rustc_cargo(builder, &mut cargo, target, compiler.stage);
cargo.arg("-Zunstable-options");
@@ -33,7 +35,7 @@ Subject: Backwards-compat for cargo 0.47
// Only include compiler crates, no dependencies of those, such as `libc`.
// Do link to dependencies on `docs.rs` however using `rustdoc-map`.
-@@ -845,7 +843,6 @@
+@@ -846,7 +844,6 @@ macro_rules! tool_doc {
&[],
);