[v2,2/9] package/cargo-bin: install if rust-bin selected

Message ID	20200115132617.26604-2-patrick.havelange@essensium.com
State	Superseded
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: Patrick Havelange <patrick.havelange@essensium.com> To: buildroot@buildroot.org Date: Wed, 15 Jan 2020 14:26:10 +0100 Message-Id: <20200115132617.26604-2-patrick.havelange@essensium.com> In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com> References: <20200115132617.26604-1-patrick.havelange@essensium.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 2/9] package/cargo-bin: install if rust-bin selected Precedence: list Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>, Patrick Havelange <patrick.havelange@essensium.com>, Sam Voss <sam.voss@gmail.com>, Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>
Series	None \| expand [v2,2/9] package/cargo-bin: install if rust-bin selected [v2,3/9] package/rust-bin: host variant depends on host-cargo-bin [v2,4/9] package/rust: drop dependency on host-cargo-bin [v2,5/9] package/ripgrep: depends on host-rustc [v2,6/9] package/cargo: drop package [v2,7/9] docs/manual: cargo packages depend on host-rustc [v2,8/9] package/rust: bump to 1.40 [v2,9/9] package/cargo-bin: remove and use cargo-bin from rust-bin package

Message ID

20200115132617.26604-2-patrick.havelange@essensium.com

State

Superseded

Headers

From: Patrick Havelange <patrick.havelange@essensium.com>
To: buildroot@buildroot.org
Date: Wed, 15 Jan 2020 14:26:10 +0100
Message-Id: <20200115132617.26604-2-patrick.havelange@essensium.com>
In-Reply-To: <20200115132617.26604-1-patrick.havelange@essensium.com>
References: <20200115132617.26604-1-patrick.havelange@essensium.com>
MIME-Version: 1.0
Subject: [Buildroot] [PATCH v2 2/9] package/cargo-bin: install if rust-bin
	selected
Precedence: list
Cc: Eric Le Bihan <eric.le.bihan.dev@free.fr>,
	Patrick Havelange <patrick.havelange@essensium.com>,
	Sam Voss <sam.voss@gmail.com>,
	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Series

None | expand

Commit Message

Patrick Havelange Jan. 15, 2020, 1:26 p.m. UTC

From: Eric Le Bihan <eric.le.bihan.dev@free.fr>

If host-rust-bin, the pre-built Rust compiler, is selected as a rustc
provider, then also install the pre-built cargo binary to be coherent.

Also install configuration file, reusing the one from rust package.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Patrick Havelange <patrick.havelange@essensium.com>
---
 package/cargo-bin/cargo-bin.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk
index 3614f7a53d..4a3d52e43b 100644
--- a/package/cargo-bin/cargo-bin.mk
+++ b/package/cargo-bin/cargo-bin.mk
@@ -10,4 +10,11 @@  CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz
 CARGO_BIN_LICENSE = Apache-2.0 or MIT
 CARGO_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
 
+ifeq ($(BR2_PACKAGE_HOST_RUST_BIN),y)
+define HOST_CARGO_BIN_INSTALL_CMDS
+       $(@D)/install.sh --prefix=$(HOST_DIR) --disable-ldconfig
+endef
+HOST_CARGO_BIN_POST_INSTALL_HOOKS += HOST_RUST_INSTALL_CARGO_CONFIG
+endif
+
 $(eval $(host-generic-package))

[v2,2/9] package/cargo-bin: install if rust-bin selected

Commit Message

Patch