From 561313658358ff0a735f30fc1f92db57cda3bf60 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Wed, 6 Jun 2018 22:34:56 -0700 Subject: [PATCH] Support cross-compile install --- debian/changelog | 6 ++++++ .../2008_support-cross-compile-install.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/2008_support-cross-compile-install.patch diff --git a/debian/changelog b/debian/changelog index a02dd8815..12dc5a37e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cargo (0.27.0-2) UNRELEASED; urgency=medium + + * Support cross-compile install (upstream PR #5614). + + -- Ximin Luo Wed, 06 Jun 2018 22:34:28 -0700 + cargo (0.27.0-1) unstable; urgency=medium * Upload to unstable. diff --git a/debian/patches/2008_support-cross-compile-install.patch b/debian/patches/2008_support-cross-compile-install.patch new file mode 100644 index 000000000..f69bafe20 --- /dev/null +++ b/debian/patches/2008_support-cross-compile-install.patch @@ -0,0 +1,18 @@ +Bug: https://github.com/rust-lang/cargo/pull/5614 +Author: Ximin Luo +Date: Wed Jun 6 22:30:10 2018 -0700 + + Support cross-compile install + +diff --git a/src/bin/cargo/commands/install.rs b/src/bin/cargo/commands/install.rs +index f0c65515..efac1a94 100644 +--- a/src/bin/commands/install.rs ++++ b/src/bin/commands/install.rs +@@ -32,6 +32,7 @@ pub fn cli() -> App { + "Install only the specified example", + "Install all examples", + ) ++ .arg_target_triple("Build for the target triple") + .arg(opt("root", "Directory to install packages into").value_name("DIR")) + .after_help( + "\ diff --git a/debian/patches/series b/debian/patches/series index cf49af978..be02009d0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 2004_clean-cargo-deps.patch 2001_use-system-libgit2.patch 2002_disable-net-tests.patch +2008_support-cross-compile-install.patch -- 2.30.2