From patchwork Fri Feb 7 18:08:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235096 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mind.be header.i=@mind.be header.a=rsa-sha256 header.s=google header.b=VLW/JjLI; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Djws2g02z9sPK for ; Sat, 8 Feb 2020 05:09:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6CE0B86E6E; Fri, 7 Feb 2020 18:08:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AL0wyEyED6vU; Fri, 7 Feb 2020 18:08:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E3C0586E49; Fri, 7 Feb 2020 18:08:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7BB591BF38E for ; Fri, 7 Feb 2020 18:08:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7860987D57 for ; Fri, 7 Feb 2020 18:08:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rfPI3vaTdY5l for ; Fri, 7 Feb 2020 18:08:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 70E6087D33 for ; Fri, 7 Feb 2020 18:08:49 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id t3so3744529wru.7 for ; Fri, 07 Feb 2020 10:08:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mind.be; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=808FjeOvRnFsy/tOwgGNHhZwyggKtmx2UIC2/WSwr7A=; b=VLW/JjLI/qs3criGpvCZ5UtppS6BtVSG9OnjiXcDywPN6uWJIak1NwQVoq0Wu2ddpA evzZpNardBGn4OorkpzVqkBETL3NzKF6bce4NCMYx09x2a8tQ7C0My039mQkVBWBA+CW IZzDLFckyfNLEF2g6wYX3mlUzR7w69QtJq958sNY4v9kMzjq+s6MsDfFUzK6h3w68BkU NjzhJSZsvj6zH6PR3UDbf/RnmVkeh4N4zQVKXR8+Wdf2NIugzFpJEXlJR+fA6UPedU/J LtYeghUPPsqbCdov+wX+CRXRHUpobCPKymoDpp1OkT4Cp53oo7pM28UQhaM7z6E/ILXd QiuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=808FjeOvRnFsy/tOwgGNHhZwyggKtmx2UIC2/WSwr7A=; b=KsJbTUj0bYu4b6ea9kTEOSl50DSA7/KkbpvrUOK6c+RYSMONBLogxza82XytSpvCyf n7RA+fSB1SwTBV4Kg+xiI5St9rZotvB235nZlqxIH23cG8tR27WQJsT361zYbbKzSzH3 3YgjLeiizKaw24H+coHXI6mngNYfzRCTjwi20I/34BWMeMvstx0mPW8OTBV1kePqyPwH pIQx9OohI8LP/l4IzhvO2ORR7P104j2idZJXEeOij7evHWbIRMSpCfhHgNZ2YIZdkpOP Rpn50BXP+xWkoJyuJ9UjTqfH+Tzq58+R++eHg911k8xwe4Ry1s3CmoCOBh4XJapjNPNg RqVA== X-Gm-Message-State: APjAAAU1k93OwjWxHL1x7tK6IFRAg6/ak4NJCew2+R6ZkFLR3JKohDU9 qTGlpfehUnVYEbHb16+1imYtpD2rZNs= X-Google-Smtp-Source: APXvYqyYrf0MVRmabdn5Yj0/qQw4ebnkL187pPrCDu/4yPoMVa08sJamvmNtlk62NFFCuQiBp8Z5XQ== X-Received: by 2002:a5d:6390:: with SMTP id p16mr282529wru.170.1581098927522; Fri, 07 Feb 2020 10:08:47 -0800 (PST) Received: from localhost.localdomain (ip-188-118-3-185.reverse.destiny.be. [188.118.3.185]) by smtp.gmail.com with ESMTPSA id b18sm4312710wru.50.2020.02.07.10.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:08:47 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:22 +0100 Message-Id: <20200207180829.165689-4-arnout@mind.be> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200207180829.165689-1-arnout@mind.be> References: <20200207180829.165689-1-arnout@mind.be> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 03/10] package/cargo-bin: install if rust-bin selected X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Patrick Havelange Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan 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. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange [Arnout: don't install cargo config, alread moved] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: David Pierret Tested-by: David Pierret --- package/cargo-bin/cargo-bin.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk index 3614f7a53d..3eaf417531 100644 --- a/package/cargo-bin/cargo-bin.mk +++ b/package/cargo-bin/cargo-bin.mk @@ -10,4 +10,10 @@ 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 +endif + $(eval $(host-generic-package))