summaryrefslogtreecommitdiffstats
path: root/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:47 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:47 +0000
commit9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1 (patch)
tree3f4102a262698a69127c4c527a3efe30a13ac7df /debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
parentMerging upstream version 1.71.1+dfsg1. (diff)
downloadrustc-9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1.tar.xz
rustc-9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1.zip
Adding debian version 1.71.1+dfsg1-1.debian/1.71.1+dfsg1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/d-0010-cargo-remove-vendored-c-crates.patch')
-rw-r--r--debian/patches/d-0010-cargo-remove-vendored-c-crates.patch23
1 files changed, 14 insertions, 9 deletions
diff --git a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
index b386a3a5f..7c31b69d9 100644
--- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
+++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
@@ -1,14 +1,17 @@
-Description: Remove embeded C libraries in bundled crates
-Author: Zixing Liu <zixing.liu@canonical.com>
-Forwarded: not-needed
+From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Date: Mon, 6 May 2024 10:25:32 +0200
+Subject: d-0010-cargo-remove-vendored-c-crates
+
Last-Update: 2023-05-17
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rust/src/tools/cargo/Cargo.toml
-===================================================================
---- rust.orig/src/tools/cargo/Cargo.toml
-+++ rust/src/tools/cargo/Cargo.toml
-@@ -114,6 +114,5 @@ test = false
+ src/tools/cargo/Cargo.toml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
+index 05c95c7..a7475f6 100644
+--- a/src/tools/cargo/Cargo.toml
++++ b/src/tools/cargo/Cargo.toml
+@@ -206,8 +206,6 @@ test = false
doc = false
[features]
@@ -16,3 +19,5 @@ Index: rust/src/tools/cargo/Cargo.toml
-vendored-libgit2 = ["libgit2-sys/vendored"]
+# Debian: removed vendoring flags
pretty-env-logger = ["pretty_env_logger"]
+ # This is primarily used by rust-lang/rust distributing cargo the executable.
+-all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx']