From patchwork Fri Feb 7 18:08:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235093 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=cExcWzdR; 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 48Djwf5RJMz9sPJ for ; Sat, 8 Feb 2020 05:08:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 37D3C86E55; Fri, 7 Feb 2020 18:08:48 +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 IpzeknbdISZv; Fri, 7 Feb 2020 18:08:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B0E71810FC; Fri, 7 Feb 2020 18:08:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 7F3721BF38E for ; Fri, 7 Feb 2020 18:08:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7BC8E868EF for ; Fri, 7 Feb 2020 18:08:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iLGwm3ulhcai for ; Fri, 7 Feb 2020 18:08:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B0CCA868D9 for ; Fri, 7 Feb 2020 18:08:38 +0000 (UTC) Received: by mail-wm1-f41.google.com with SMTP id a5so3497035wmb.0 for ; Fri, 07 Feb 2020 10:08:38 -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=KKJ/4R+jaEwFLjfSrp+WjUkL6w+kl+rq/FRDzRrj/YU=; b=cExcWzdRwfnmY9zPMI5xzk1mr9PaAvw2dh489R485gvHuFvCU0XZQnmghncEFfmb4z bGrG4fvArR4De8fHiKMCF2wn2fg3rc93KhKQRIPb0lpyILwTgDgbJ366OmvIxwD/OFh1 w7Fx98SjmXBWY+QE+QrWlJKYrII5KTNsePMrTNjvUWjbODRRBDSaoRj5wlOXyvA4Q+0h 0ejNi+dZRMpS4unNCV2HQaop32gpfXJBLNZf0tqXd3zkOqkPl+fN/KlFd22memTcs/tJ LyzaWds/LGxI9prgkKrlDZyNWCLigG8uvDKAEiYf3SQ86GFBXcOiSPMmphEZy9/SYyp2 pkFg== 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=KKJ/4R+jaEwFLjfSrp+WjUkL6w+kl+rq/FRDzRrj/YU=; b=HuFdRs+42m86hyqVCeHNTAM3h5Og3cu+DWyVq5/BtJbteJEY/IG9WU02OrPrfvYqTh qhcJZ4ZTDyq01T26LdNYvH1MsVFgDQ4Pc7CY80hSNRyvvg4PRE0uD+aDG95p4KcwxdhW zJKWc5cqD5fj1+YTUHK9bB8E4ULTZJ6xVvKsXAH7Ghkxx5TuoK2SkDF1iN7dKQl87jf9 mjjol0PLGB9mMtfPLv2m/WR5DFhuphPEcES335kxo9pvztihybp6yoFVK4nfJdNICR1j 0y2Qj/ZaB6ao73Q1/5jEe/CSpfTkrX5A46NTTMZz0ijHyakP7D19rBzGWSe2hu5yHAif htgg== X-Gm-Message-State: APjAAAVwG0ErHa4FjjQpd7L/HB6LssyCQj7tA4V1NAWt/76M4FWhmGcb zrlj2hgWmkF74l12IQI+65/Yl1U5zzM= X-Google-Smtp-Source: APXvYqzTixGrytg4SlxBTmVnGWXK06j5O+FfS3OI1DcvhfjvofWMFwOhGEyhtA5FK54rhPtad5E8yA== X-Received: by 2002:a7b:cf39:: with SMTP id m25mr5520397wmg.146.1581098916809; Fri, 07 Feb 2020 10:08:36 -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 133sm4563938wmd.5.2020.02.07.10.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:08:36 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:20 +0100 Message-Id: <20200207180829.165689-2-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 01/10] package/rustc: install cargo config as toolchain post-install hook 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" The cargo config file is much like the cmake and meson configuration files, something that tells the cargo build system how the cross-toolchain is configured. It can be used not only with our own host-cargo package, but also with a pre-installed cargo. Therefore, install the cargo config file as a toolchain post-install hook, just like we do for cmake and meson. However, we don't have a pkg-cargo infrastructure (yet) so we can't put it there. The cargo package itself will be removed soon, so that's not appropriate either. Therefore, put it in the rustc package - any cargo package will need rustc. Remove the config handling from the cargo package. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: David Pierret --- package/cargo/cargo.mk | 6 ------ package/{cargo/config.in => rustc/cargo-config.in} | 0 package/rustc/rustc.mk | 12 ++++++++++++ 3 files changed, 12 insertions(+), 6 deletions(-) rename package/{cargo/config.in => rustc/cargo-config.in} (100%) diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk index a387281b4c..3f6646d027 100644 --- a/package/cargo/cargo.mk +++ b/package/cargo/cargo.mk @@ -80,12 +80,6 @@ endef define HOST_CARGO_INSTALL_CMDS $(INSTALL) -D -m 0755 $(@D)/target/release/cargo $(HOST_DIR)/bin/cargo - $(INSTALL) -D package/cargo/config.in \ - $(HOST_DIR)/share/cargo/config - $(SED) 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ - $(HOST_DIR)/share/cargo/config - $(SED) 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ - $(HOST_DIR)/share/cargo/config endef $(eval $(host-generic-package)) diff --git a/package/cargo/config.in b/package/rustc/cargo-config.in similarity index 100% rename from package/cargo/config.in rename to package/rustc/cargo-config.in diff --git a/package/rustc/rustc.mk b/package/rustc/rustc.mk index 6eea9b4fc5..35ffc36106 100644 --- a/package/rustc/rustc.mk +++ b/package/rustc/rustc.mk @@ -20,3 +20,15 @@ endif RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu $(eval $(host-virtual-package)) + +ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) +define RUSTC_INSTALL_CARGO_CONFIG + mkdir -p $(HOST_DIR)/share/cargo + sed -e 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \ + -e 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \ + package/rustc/cargo-config.in \ + > $(HOST_DIR)/share/cargo/config +endef +# check-package disable TypoInPackageVariable - TOOLCHAIN intended +TOOLCHAIN_POST_INSTALL_STAGING_HOOKS += RUSTC_INSTALL_CARGO_CONFIG +endif From patchwork Fri Feb 7 18:08:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235094 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.137; helo=fraxinus.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=E28tmrHi; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Djwh0ygTz9sSG for ; Sat, 8 Feb 2020 05:08:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BCA11868D9; Fri, 7 Feb 2020 18:08:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5vRFh_Rx3Kt4; Fri, 7 Feb 2020 18:08:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DD4E3868EF; Fri, 7 Feb 2020 18:08:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id BD0C81BF38E for ; Fri, 7 Feb 2020 18:08:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B58DC20492 for ; Fri, 7 Feb 2020 18:08:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rF7UnxHrB+Bs for ; Fri, 7 Feb 2020 18:08:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by silver.osuosl.org (Postfix) with ESMTPS id 50A8F20131 for ; Fri, 7 Feb 2020 18:08:44 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id s10so3471816wmh.3 for ; Fri, 07 Feb 2020 10:08:44 -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=uN6jShHr7N3lRaKGh3yzDxqSUk0Lyje9GlAgFagT6kI=; b=E28tmrHiaKvr0AYe4Muhg0mVI1JzWncRraA0VnlOv7b3ZhubeEKHGsZdj6Z1PsosYP /9M2vEjppdOSOgDvZ+geVJRfjZjxCv4ike9V8BGpbo/fP1XTK1oHybAWbPYep2M8AdDs CYL0cWz2XzmxLZFByQBxqHtpAOtE2So4HthfX5UzBPbOTs2KxxS3W4geORkPlZuXkjWq YqW5RnEqZXeNYP6WD7X6dvQAF2io9Kj9o7+ABgjwJhL3NqWGjF1DW47EMi3gq1HixXgI USoTBAOld1sR4qo7mDYsNXhYcNiAnkZ4Ac6yyo5nLCUvcb4uK095Zs22/x5mSYQ5WUWD Jwkw== 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=uN6jShHr7N3lRaKGh3yzDxqSUk0Lyje9GlAgFagT6kI=; b=tiKoqUzfqYhwAWXhmM1+a1wW7Qoq82jY+YQ0a2ftNPGnSyCgLKUiB3wU0/PWsV9ujS SSQbM1mF4N1H+1LAAEsd37iyp1gRMT6/9JL61gQqKSUmPhfU+qMtOvX6ZFbhegMhPcqJ uMabS7BKuReUaKgPuyTkyGQDmeAcILthjPev+REHNhnvtFEIlj3X48iHnXnX32MVIUgF LVaJZ2LS5ZqOGTYedvf7IkjsPHrRwEes0tgmmDYNiyRngngMFiPeUBUix7ABSAaK7Fno BzjgKWpUYmcx4rbCda2I+sGAuSWbxLN6tsNE9BPf15RPEghkMVqVnf05vYfIFn+skA/l TK1A== X-Gm-Message-State: APjAAAVlaspfg0Wd/WVLE+meA8f20sMVnTind9ojSp6lPIQmtmVsBckd SiY66LNmO2rCaiFjs2iPkFh3C6eQ2Gw= X-Google-Smtp-Source: APXvYqxmPUg79AxjS9fCi9LTz8JkTh6L+7CfcaWwBgYAGOfs2WhSHTLZkQ1lgeNxCFtDkKxTjJaRUA== X-Received: by 2002:a7b:ce84:: with SMTP id q4mr5382538wmj.57.1581098922150; Fri, 07 Feb 2020 10:08:42 -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 z3sm4231557wrs.32.2020.02.07.10.08.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:08:41 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:21 +0100 Message-Id: <20200207180829.165689-3-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 02/10] package/rust: build and install cargo 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 , Sam Voss Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Eric Le Bihan Cargo source code is not provided anymore as a separate tarball but is now built along with the Rust compiler. So update rust host variant to build Cargo and install the cross-compilation configuration file. All this will be overwritten again by the host-cargo package, but that will be removed in later commits. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange Tested-by: Sam Voss [Arnout: merge all install commands in HOST_RUST_INSTALL_CMDS] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: David Pierret --- package/rust/rust.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 5d14fc6682..9bbed15082 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -47,11 +47,14 @@ define HOST_RUST_CONFIGURE_CMDS echo 'python = "$(HOST_DIR)/bin/python2"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ + echo 'extended = true'; \ + echo 'tools = ["cargo"]'; \ echo 'compiler-docs = false'; \ echo 'docs = false'; \ echo 'verbose = $(HOST_RUST_VERBOSITY)'; \ echo '[install]'; \ echo 'prefix = "$(HOST_DIR)"'; \ + echo 'sysconfdir = "$(HOST_DIR)/etc"'; \ echo '[rust]'; \ echo 'channel = "stable"'; \ echo '[target.$(RUSTC_TARGET_NAME)]'; \ 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)) From patchwork Fri Feb 7 18:08:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235095 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.137; helo=fraxinus.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=Y63lOvEC; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Djwp6yFjz9sPJ for ; Sat, 8 Feb 2020 05:08:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 72AD886914; Fri, 7 Feb 2020 18:08:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WDgXMHB3Aa_C; Fri, 7 Feb 2020 18:08:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D8B86868DE; Fri, 7 Feb 2020 18:08:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id EEC361BF38E for ; Fri, 7 Feb 2020 18:08:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E9D962048A for ; Fri, 7 Feb 2020 18:08:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qnqiWTsyll0j for ; Fri, 7 Feb 2020 18:08:55 +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 silver.osuosl.org (Postfix) with ESMTPS id D84A520131 for ; Fri, 7 Feb 2020 18:08:54 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id u6so3793093wrt.0 for ; Fri, 07 Feb 2020 10:08:54 -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=uzv9l58qBArQpqDXqlHxnZcyvM9BuqtFgop9NRH/H5k=; b=Y63lOvECEDajKkz45ZH9pwR6pRVb+3L/so7qMaTQMeqyxp3za948E/WEhlA2Z8azit ZNY5A2ZMw7W3XYO+i3pkkwF+SfeVWPZaM3Sf2MwxA9baMWyH8RvBWRF1QkTWkIWVxrCR RhepilLaoqrCWxvd5ELTOJOIJO2jA2K6c8aIjtKsWGZCvJ+f/v2ZAoLXh3LxeRxNO0ua SNOMH4PphqfVf02MJG+xTXlSKqYzy01RDmVggeLnOHQxdW2A0pH5WDXMLFzg8r17HTLa iLbzUkdkEo243CATFJzqZJqgYPU3LgMY2mh3MJgaMdW+vw+jbp9Gr5LXAjC8Y4gvfvXO tWjg== 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=uzv9l58qBArQpqDXqlHxnZcyvM9BuqtFgop9NRH/H5k=; b=cB2vJsBky2Q99xt9RSzvqe+eWOyhYHugcQurk+0wkvaqzV+mTRt+mVKSFF9fXc0oUS vKF/zQYYO9/t54C0vMviltptqHoAQ2KpCAvIGafUML1I1f9ciwr8VHb4ZgcxqvKamKwy 64VPXiqXLbVCqFEj5f8kJL3vo5xclnWPlT80Q1478LBrkM+Z/w+dpoeco+ARgopRqO/Y Z+VFpijcgBPct91zb2BZQRjdnENiasRUFX7vW7pW4VQwlqZEM0NSfLZu2HDK6xCcQw9c LhSNAOW97+1B3PRXwM3nJ0E99ItW7jHlBgvkmqqA16+CBdSV0L4ZrwpyttFq7UxSi3dW xW3w== X-Gm-Message-State: APjAAAUZRwoOcPtW5B/ApkiBg2D9tHdRi55z0quRNJjwP3PJN5JkmUUM Sf+ECaZ0BN+ZL8/3EKO1YdW4J72skoE= X-Google-Smtp-Source: APXvYqwqgPN8CZvoPPNFozXGY6UJqb38RfWJfoon+PD/3QNn4PFYI+Xsmhei8p/RvHENSzw5qCmCkA== X-Received: by 2002:a5d:5152:: with SMTP id u18mr256488wrt.214.1581098933126; Fri, 07 Feb 2020 10:08:53 -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 b21sm4453601wmd.37.2020.02.07.10.08.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:08:52 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:23 +0100 Message-Id: <20200207180829.165689-5-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 04/10] package/rust-bin: host variant depends on host-cargo-bin 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 Ensure installation of pre-built cargo binary by adding it to the dependency list of the host variant of the pre-built Rust compiler. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: David Pierret Tested-by: David Pierret --- package/rust-bin/rust-bin.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index a374215e20..bef3102450 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -10,6 +10,7 @@ RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT HOST_RUST_BIN_PROVIDES = host-rustc +HOST_RUST_BIN_DEPENDENCIES = host-cargo-bin HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz From patchwork Fri Feb 7 18:08:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235097 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.136; helo=silver.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=OmG53vL9; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Djx32gLCz9sPJ for ; Sat, 8 Feb 2020 05:09:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 2D7EF2262E; Fri, 7 Feb 2020 18:09:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OM2KLIP1zQ+5; Fri, 7 Feb 2020 18:09:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D021A2048A; Fri, 7 Feb 2020 18:09:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 0859F1BF9BF for ; Fri, 7 Feb 2020 18:09:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 052F68691E for ; Fri, 7 Feb 2020 18:09:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8kX41nMskmP6 for ; Fri, 7 Feb 2020 18:09:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5703E868DE for ; Fri, 7 Feb 2020 18:09:00 +0000 (UTC) Received: by mail-wm1-f47.google.com with SMTP id p17so3801525wma.1 for ; Fri, 07 Feb 2020 10:09:00 -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=d+DzqxkLucnqVwz0gXXsYr5oOBZ6Qb1q0pQKIG+4Xz8=; b=OmG53vL9HAJAmi4KGefsm5deCaYk7guX9YskrLatmRTKDF/XMR3s2dtxtP8osTa63U blQFbpB0uU0QgRIRzM7s4rG484hc/69MsalDlYAUMkpqHEY2wfhTJKOzY7phlYqoQqXf kYI+NEu6ax4zha3ajxV6DRwZbelsdz4ougdPTQ4WO/cwrB8MMLld/GNzL71djQpueHEh qLztjEGepLF3Ipp72jKgt5QfW9MqPbrT60WEnaOrHIgfQNQ/wtI0Hf2PrkcBeCTpwjVp xBRzhGGeTQI/c3ludM8Pjwhu85ZQYnll+aSH2ppcDg2fEIu3CvvgkOKa7zIfjbJ1o5Ii Fuow== 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=d+DzqxkLucnqVwz0gXXsYr5oOBZ6Qb1q0pQKIG+4Xz8=; b=KSTJ5eqJv7G1FYRHn5QKHQqnOe/BUc3LGkojcmQOMrZRH4cZ5lciIO3SxWmerMibSX WPnE0blK2AaEpmmswt/syJgOCWNAJs0EhldPgmNyHA64h7IB2ItnaIggzhTHU2x1oucL lijVnX4snLXOQl2xUuk5EBQ0bk9oqAb4xGbBsLujd6EgWKSi4/p5KsD3jpy48QFhozQW /nL8sNIIzu12K1yARTALwqAFKpd8zzOug8AQuuQCmMsRYQbcvmD0wJqbpoXjqUH8FA9q BZqv+ETRMxm57tsDMoIY9VeKCGCxACpLkdtLmISBPbmEm9tvZvzV2/pdtCHQztqHMbE2 pu0g== X-Gm-Message-State: APjAAAWlpWSAP5OaWHjot4msrxH7rbZE/7rK6uD7S1LMMwOFggTv1eZk 32pCOQH+cpx+bANOVB4pXPr6uqM3Qrk= X-Google-Smtp-Source: APXvYqyZTJ25yJMU03Z/Q6iwxGK9+xQs1vgPHDouRRbzkXrUp9WYyx3dslhi2p58/qPZAGdKjr07Gw== X-Received: by 2002:a7b:ca49:: with SMTP id m9mr5761875wml.50.1581098938566; Fri, 07 Feb 2020 10:08:58 -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 d13sm4295995wrc.3.2020.02.07.10.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:08:58 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:24 +0100 Message-Id: <20200207180829.165689-6-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 05/10] package/rust: drop dependency on host-cargo-bin 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 As host-rust depends on host-rust-bin, which depends on host-cargo-bin, remove unneeded dependency. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: David Pierret Tested-by: David Pierret --- package/rust/rust.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 9bbed15082..588e1088f8 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -15,7 +15,6 @@ HOST_RUST_PROVIDES = host-rustc HOST_RUST_DEPENDENCIES = \ toolchain \ host-rust-bin \ - host-cargo-bin \ host-openssl \ host-python \ $(BR2_CMAKE_HOST_DEPENDENCY) From patchwork Fri Feb 7 18:08:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235098 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.137; helo=fraxinus.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=cRJoCCzO; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DjyJ2WLsz9sPK for ; Sat, 8 Feb 2020 05:10:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8195586911; Fri, 7 Feb 2020 18:10:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jtQ7_igBh8ke; Fri, 7 Feb 2020 18:10:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B171E860C0; Fri, 7 Feb 2020 18:10:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A87E01BF38E for ; Fri, 7 Feb 2020 18:09:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A054C810FC for ; Fri, 7 Feb 2020 18:09:13 +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 SyKTUyjhCfHZ for ; Fri, 7 Feb 2020 18:09:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id E5A0886E1D for ; Fri, 7 Feb 2020 18:09:06 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id c9so3745616wrw.8 for ; Fri, 07 Feb 2020 10:09:06 -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=XHFkzji9Vgy5NvtCSbiFWiyQURt7VIhDEKZiorviKr4=; b=cRJoCCzOn8bI7TWK3oe04U94Oq+rhQ/FkZnd9GMYbKwBtKT/3euJ//5AsJOiyqGlXO A8RXHVdMgXRuI+CTMG4rvU7hZ9A/r4aXsCJMet+9qcHi/bM87zY85VEtks1UhZxiVb0f 3Vmid/TBKA8yuAP24O+LePVtuxdHCqw/LIPtUe0WcjYHkX6OQcd2T1hYmh94iWfgLkNZ +NlySH36fdUGU/bqzaostX1ohPP4XER34ENqFMo/c4/onhRN65b+/6aZNnqe2x0TpZT8 LAFonA1V0G+wnB4ooWuVTrZSDvMjmWancPhVkWG128cqbovDmMNRw2CG8HVZWLh1Mbtd Adcg== 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=XHFkzji9Vgy5NvtCSbiFWiyQURt7VIhDEKZiorviKr4=; b=e46FNUDFOZSDuC+UmzwzSq6HWJJw9RVt6vBARZ5R86zKqYQEIcuF08TjyV0Z0ugT9d P6YLw6MSlHiUN9C4QbIG+TdBqRXBDbBFqwTCCIhOMmm35IWnpUa7LoJi7e5DkCpHeGPP IuVP9g46ZpVeJhGpt+jSSufLpGHCfs9W11vyGJuj/owTRMnrjDj6k14QhJt36UoXktUv vs+6iR5BdwZj3mVB5HzHjQjSUZ+8U7/2QgX892aswWs106+7/WoyUaDGov8AquscHLum gQ69j3BJmYpbUnwBZccG3AODdS98VzRydeEtfvR+SIdmjzTQ18sSIQ32/QxDfcFwSFX7 GAjw== X-Gm-Message-State: APjAAAUrUOY54SUepL1K5DYWMw9tq8LJEx5s680W9xAlHBPVUnDq2Cvw DvnwNifTwA6Qz8wW1Mo03F+MbEZeUoM= X-Google-Smtp-Source: APXvYqzgk4Sd3ZWGCTFpNYfxeqLAHBKC0JftlBGVnt/wO/rnKQOMTtmC3FeUL9oDyT5pQ/SokOFEFA== X-Received: by 2002:a05:6000:12c7:: with SMTP id l7mr257498wrx.136.1581098944949; Fri, 07 Feb 2020 10:09:04 -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 t9sm4162594wmj.28.2020.02.07.10.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:09:04 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:25 +0100 Message-Id: <20200207180829.165689-7-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 06/10] package/ripgrep: depends on host-rustc 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 As all providers of rustc also install cargo, there is no need to depend on the standalone cargo package anymore. Instead add host-rustc to the dependency list. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: David Pierret Tested-by: David Pierret --- package/ripgrep/Config.in | 2 +- package/ripgrep/ripgrep.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ripgrep/Config.in b/package/ripgrep/Config.in index 5446ad046c..0ea2902b34 100644 --- a/package/ripgrep/Config.in +++ b/package/ripgrep/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RIPGREP bool "ripgrep" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_CARGO + select BR2_PACKAGE_HOST_RUSTC help ripgrep is a line-oriented search tool that recursively searches your current directory diff --git a/package/ripgrep/ripgrep.mk b/package/ripgrep/ripgrep.mk index 0bb7017a96..832c076f26 100644 --- a/package/ripgrep/ripgrep.mk +++ b/package/ripgrep/ripgrep.mk @@ -9,7 +9,7 @@ RIPGREP_SITE = $(call github,burntsushi,ripgrep,$(RIPGREP_VERSION)) RIPGREP_LICENSE = MIT RIPGREP_LICENSE_FILES = LICENSE-MIT -RIPGREP_DEPENDENCIES = host-cargo +RIPGREP_DEPENDENCIES = host-rustc RIPGREP_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo RIPGREP_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release) From patchwork Fri Feb 7 18:08:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235101 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.133; helo=hemlock.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=eJjAwoaf; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DjyQ5p50z9sRh for ; Sat, 8 Feb 2020 05:10:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E3EB387ED0; Fri, 7 Feb 2020 18:10:17 +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 gSNLGpQ7B7cg; Fri, 7 Feb 2020 18:10:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6035A87D57; Fri, 7 Feb 2020 18:10:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B295C1BF38E for ; Fri, 7 Feb 2020 18:10:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D498E84627 for ; Fri, 7 Feb 2020 18:09:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2sWLkBqwczjX for ; Fri, 7 Feb 2020 18:09:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by fraxinus.osuosl.org (Postfix) with ESMTPS id C79BF845C0 for ; Fri, 7 Feb 2020 18:09:12 +0000 (UTC) Received: by mail-wr1-f49.google.com with SMTP id y11so3756627wrt.6 for ; Fri, 07 Feb 2020 10:09:12 -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=AywkNe6JFPRK2uEPDC9nKij36u/gtjGnqqFvAxNTQYY=; b=eJjAwoafd42MhVcWXYdXLc2BrNLPUJRyCGFOcyPzTINL0pNXYlJMOP9Di3dWh6N1u3 hMbvfOR6M80fkD5svtsXp5vCO9km/E22ZFIQhQD4O+6P/Jt8iJPsIYRr5rzkW1ej2PrK LqNVprwLswV3Q7qnfYCWvr+ykZBGsKNDUuuYbwRbrVul8uiXFbtDUPpcd8WUiisKIZAE Uheol24tzLoCRwCusJojJ99EzfyTNbsOMZY9LD6vuw+BPinVul74IWODrC7wsr2vQIt4 hi0B+ibPe4KHUVip4UEoXE2Yu3bITYHAW6OhUSHxAdjnLyC41/UHNpyQUcQd6R4h9emI zTnA== 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=AywkNe6JFPRK2uEPDC9nKij36u/gtjGnqqFvAxNTQYY=; b=EL9642O15xc7aS5wZhjOGQlZCHdbwYKpXvIDtpUTwNazhaYhP44pBI5gGNu54gDsuJ h0l+3kAf+gwx+w9RIbpGcxGzc3vWYjSWdVzlf8LCFF7Xsw4MVesdmXx5XWwFBbBgCbtX cMxCQGHAlXdKTSSZ5Bj1WCZ8KJ58si7dLKtw6M0WOZu1jaND6nsWG624u5jPtmbXFqX9 0+xKzd1kdXkD1r3xyM+yqfMmNttnfjAtEj3cCq8YSEYl9mlpGC0WPsRqWuIWIuySSa4O ywrqhHWcdqjFRLbhd7rrhzbvl6psoWjuhNLTqTGTFXDggjjaFw607uFpHYKHH2/pwcm3 /OPw== X-Gm-Message-State: APjAAAWZ9JNKOoeLZ3/WquAnNBXbZE4aztmCBxbGhM0zoUPQPnVKw/ky muAWzGLpcrNRkqqClsuohcQoqBhCnFU= X-Google-Smtp-Source: APXvYqycZAbDJM5ABb0t+PJhUhPsz5A1KP0LMJ08GhIigPvf8KiKNmEBX98u0DdcBHWf0IZQBo3URw== X-Received: by 2002:adf:f5cb:: with SMTP id k11mr234727wrp.63.1581098950942; Fri, 07 Feb 2020 10:09:10 -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 z6sm4483955wrw.36.2020.02.07.10.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:09:10 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:26 +0100 Message-Id: <20200207180829.165689-8-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 07/10] package/cargo: drop package 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 As no package depends on the standalone cargo package, it can be dropped. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: David Pierret Tested-by: David Pierret --- DEVELOPERS | 1 - package/Config.in.host | 1 - package/cargo/Config.in.host | 9 --- package/cargo/cargo.hash | 8 -- package/cargo/cargo.mk | 85 ---------------------- support/testing/tests/package/test_rust.py | 2 - 6 files changed, 106 deletions(-) delete mode 100644 package/cargo/Config.in.host delete mode 100644 package/cargo/cargo.hash delete mode 100644 package/cargo/cargo.mk diff --git a/DEVELOPERS b/DEVELOPERS index 3520072034..e0f6e7278c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -709,7 +709,6 @@ N: Eric Le Bihan F: docs/manual/adding-packages-meson.txt F: package/adwaita-icon-theme/ F: package/cargo-bin/ -F: package/cargo/ F: package/darkhttpd/ F: package/eudev/ F: package/execline/ diff --git a/package/Config.in.host b/package/Config.in.host index 62e860d7c3..d69961e813 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -3,7 +3,6 @@ menu "Host utilities" source "package/aespipe/Config.in.host" source "package/android-tools/Config.in.host" source "package/btrfs-progs/Config.in.host" - source "package/cargo/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" source "package/checksec/Config.in.host" diff --git a/package/cargo/Config.in.host b/package/cargo/Config.in.host deleted file mode 100644 index c33c6851f2..0000000000 --- a/package/cargo/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_CARGO - bool "host cargo" - depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_RUSTC - help - Cargo is the package manager for the Rust programming - language. - - https://crates.io/ diff --git a/package/cargo/cargo.hash b/package/cargo/cargo.hash deleted file mode 100644 index baa2cfbc33..0000000000 --- a/package/cargo/cargo.hash +++ /dev/null @@ -1,8 +0,0 @@ -# Locally generated -sha256 1a4bae6910ca895157a1abe8225eb2b7e9b49ee1ee1e4e72fb81cb8e1446bff9 cargo-0.26.0.tar.gz -sha256 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880 LICENSE-THIRD-PARTY -# From https://src.fedoraproject.org/repo/pkgs/cargo/cargo-0.26.0-vendor.tar.xz/sha512 -sha512 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 cargo-0.26.0-vendor.tar.xz diff --git a/package/cargo/cargo.mk b/package/cargo/cargo.mk deleted file mode 100644 index 3f6646d027..0000000000 --- a/package/cargo/cargo.mk +++ /dev/null @@ -1,85 +0,0 @@ -################################################################################ -# -# cargo -# -################################################################################ - -CARGO_VERSION = 0.26.0 -CARGO_SITE = $(call github,rust-lang,cargo,$(CARGO_VERSION)) -CARGO_LICENSE = Apache-2.0 or MIT -CARGO_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT - -CARGO_DEPS_SHA512 = 6ed2a1644c9b18fc24ddad5350d41b6c36cd5b62de4cf0b748a57b589f4f0ac12f91461989158d58d0892bf6fc2c1626cf574e7e2b9da4b0e35f72dfd88f9048 -CARGO_DEPS_SITE = https://src.fedoraproject.org/repo/pkgs/cargo/$(CARGO_DEPS_SOURCE)/sha512/$(CARGO_DEPS_SHA512) -CARGO_DEPS_SOURCE = cargo-$(CARGO_VERSION)-vendor.tar.xz - -CARGO_INSTALLER_VERSION = 4f994850808a572e2cc8d43f968893c8e942e9bf -CARGO_INSTALLER_SITE = $(call github,rust-lang,rust-installer,$(CARGO_INSTALLER_VERSION)) -CARGO_INSTALLER_SOURCE = rust-installer-$(CARGO_INSTALLER_VERSION).tar.gz - -HOST_CARGO_EXTRA_DOWNLOADS = \ - $(CARGO_DEPS_SITE)/$(CARGO_DEPS_SOURCE) \ - $(CARGO_INSTALLER_SITE)/$(CARGO_INSTALLER_SOURCE) - -HOST_CARGO_DEPENDENCIES = \ - $(BR2_CMAKE_HOST_DEPENDENCY) \ - host-pkgconf \ - host-openssl \ - host-libhttpparser \ - host-libssh2 \ - host-libcurl \ - host-rustc \ - host-cargo-bin - -HOST_CARGO_SNAP_BIN = $(HOST_CARGO_BIN_DIR)/cargo/bin/cargo -HOST_CARGO_HOME = $(HOST_DIR)/share/cargo - -define HOST_CARGO_EXTRACT_DEPS - @mkdir -p $(@D)/vendor - $(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \ - $(HOST_CARGO_DL_DIR)/$(CARGO_DEPS_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) - -endef - -HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS - -define HOST_CARGO_EXTRACT_INSTALLER - @mkdir -p $(@D)/src/rust-installer - $(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \ - $(HOST_CARGO_DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) - -endef - -HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER - -define HOST_CARGO_SETUP_DEPS - mkdir -p $(@D)/.cargo - ( \ - echo "[source.crates-io]"; \ - echo "registry = 'https://github.com/rust-lang/crates.io-index'"; \ - echo "replace-with = 'vendored-sources'"; \ - echo "[source.vendored-sources]"; \ - echo "directory = '$(@D)/vendor'"; \ - ) > $(@D)/.cargo/config -endef - -HOST_CARGO_PRE_CONFIGURE_HOOKS += HOST_CARGO_SETUP_DEPS - -HOST_CARGO_SNAP_OPTS = \ - --release \ - $(if $(VERBOSE),--verbose) - -HOST_CARGO_ENV = \ - RUSTFLAGS="$(addprefix -Clink-arg=,$(HOST_LDFLAGS))" \ - CARGO_HOME=$(HOST_CARGO_HOME) - -define HOST_CARGO_BUILD_CMDS - (cd $(@D); $(HOST_MAKE_ENV) $(HOST_CARGO_ENV) $(HOST_CARGO_SNAP_BIN) \ - build $(HOST_CARGO_SNAP_OPTS)) -endef - -define HOST_CARGO_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/target/release/cargo $(HOST_DIR)/bin/cargo -endef - -$(eval $(host-generic-package)) diff --git a/support/testing/tests/package/test_rust.py b/support/testing/tests/package/test_rust.py index 9854c3692e..15bb93dd97 100644 --- a/support/testing/tests/package/test_rust.py +++ b/support/testing/tests/package/test_rust.py @@ -73,7 +73,6 @@ class TestRustBin(TestRustBase): BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y """ @@ -102,7 +101,6 @@ class TestRust(TestRustBase): BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set - BR2_PACKAGE_HOST_CARGO=y BR2_PACKAGE_HOST_RUSTC=y BR2_PACKAGE_HOST_RUST=y """ From patchwork Fri Feb 7 18:08:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235100 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.137; helo=fraxinus.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=JYkHzF9P; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DjyL0rnFz9sPJ for ; Sat, 8 Feb 2020 05:10:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 54F2386928; Fri, 7 Feb 2020 18:10:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u1qLK8gDPzhq; Fri, 7 Feb 2020 18:10:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id A9F30868BC; Fri, 7 Feb 2020 18:10:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id BBC951BF9BD for ; Fri, 7 Feb 2020 18:09:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B880B81FD3 for ; Fri, 7 Feb 2020 18:09:19 +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 Q26VO9RihHOf for ; Fri, 7 Feb 2020 18:09:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 01BAD81FAA for ; Fri, 7 Feb 2020 18:09:18 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id s10so3473569wmh.3 for ; Fri, 07 Feb 2020 10:09:18 -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=zpf4fguVD4n1KGK2whhV7fA6/Py0w98q3M+eVtrwPzI=; b=JYkHzF9PjvLNSzW9sbyHggG8yJrGXGZnQNEAlE7b2NOKeenzdsBTTneJncHT9iD3lg 62YP45Z9rNNDvwXwqkGxf5vFyYndabFNoerljUgY+LH1oEzXKk1wGB3MxJY8RZKbdcAm 95VNp+AxpTo6yMP2z82osChSvgZwEunkPPodpkQatpMtDAh15G9PyH0PBBdtgDzdV3uD OvHXHg3lmMPLsWWIIGu2yNmMn7xDKtqSI3HWiQf1RpMO2IQddX85LOve++20tgMM68h6 zLraBL+vpEPpZ7mvYyZMHMYB1or2sIuqhB7/bBIVyC+S7Cl2YgTe0c2rezs95rD9d0EH Q5zQ== 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=zpf4fguVD4n1KGK2whhV7fA6/Py0w98q3M+eVtrwPzI=; b=YAVE0E/O3ZhUmtDpriITW1wCwsUAeLuKTd9EqfTc7xDU3OzXoJdFzPe735oRNPr+el tfG+xnqFNqksM32/JZDoZb7oSccJwXAOalh/oAw7WxW3S5UE+TG9cB+1cMrWLfFncZon KYk3UC+oTywcojAwjqyWmrKc/46Na8UI8DrRrMrGHXCLmpk/7hBTDybOGGcyqr1d9c5M fJ7JJIOaQUNi87EzrczOGc00h8sxTMyvjoCXPwE1lmmghNOeCofTw+fDpq6ksIdMwgYV KY7XIycDoW/uh2kY7hFMT6tngvcX9dvMHQNbSdLGfb6UuveH5OAxTdplYX/9LPVnpTIi sQiQ== X-Gm-Message-State: APjAAAWOtWNHloUF71Zpo1oxmU5XDvEL8VvFoM1anzn1TR2Msx68kbvl D9NNxXG3IpClVgoWZnbj4BbdkIRDReM= X-Google-Smtp-Source: APXvYqzW/zoBbWGzjzp08kXAypJGqikm8BhX5wCyEacX06AIIHbXZOFEYPLyL1f/ZLtzJCviiMOreg== X-Received: by 2002:a05:600c:2406:: with SMTP id 6mr5598017wmp.30.1581098956324; Fri, 07 Feb 2020 10:09:16 -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 g128sm4080277wme.47.2020.02.07.10.09.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:09:15 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:27 +0100 Message-Id: <20200207180829.165689-9-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 08/10] docs/manual: cargo packages depend on host-rustc 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 As Cargo is either installed by host-rust or host-rust-bin, the Cargo-based packages should depend on host-rustc. Signed-off-by: Eric Le Bihan Signed-off-by: Patrick Havelange [Arnout: also select HOST_RUSTC in Config.in] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: David Pierret Tested-by: David Pierret --- docs/manual/adding-packages-cargo.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-packages-cargo.txt b/docs/manual/adding-packages-cargo.txt index b6029e1eed..bb078b6981 100644 --- a/docs/manual/adding-packages-cargo.txt +++ b/docs/manual/adding-packages-cargo.txt @@ -18,7 +18,7 @@ The +Config.in+ file of Cargo-based package 'foo' should contain: 01: config BR2_PACKAGE_FOO 02: bool "foo" 03: depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS -04: select BR2_PACKAGE_HOST_CARGO +04: select BR2_PACKAGE_HOST_RUSTC 05: help 06: This is a comment that explains what foo is. 07: @@ -44,7 +44,7 @@ package. Let's start with an example: 10: FOO_LICENSE = GPL-3.0+ 11: FOO_LICENSE_FILES = COPYING 12: -13: FOO_DEPENDENCIES = host-cargo +13: FOO_DEPENDENCIES = host-rustc 14: 15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo 16: FOO_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release) From patchwork Fri Feb 7 18:08:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235102 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.137; helo=fraxinus.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=Oi0QWBWY; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48DjyS093xz9sRs for ; Sat, 8 Feb 2020 05:10:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 43D37860C0; Fri, 7 Feb 2020 18:10:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hhpLyN99XshB; Fri, 7 Feb 2020 18:10:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8661C868EF; Fri, 7 Feb 2020 18:10:13 +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 B7ADF1BF38E for ; Fri, 7 Feb 2020 18:09:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B41C587D33 for ; Fri, 7 Feb 2020 18:09:27 +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 yInqpT2J-vjo for ; Fri, 7 Feb 2020 18:09:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by hemlock.osuosl.org (Postfix) with ESMTPS id E66B78783F for ; Fri, 7 Feb 2020 18:09:24 +0000 (UTC) Received: by mail-wr1-f52.google.com with SMTP id k11so3731722wrd.9 for ; Fri, 07 Feb 2020 10:09:24 -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=stSxE1BNbcB+u/wKP4s+2Ei9BunsyUMUezbX6iZbfwE=; b=Oi0QWBWYNjQ2cu7OSzsaQAttI0TylE37J4fG7GYJxNzteegYK3th+5AhNJH42LgSNu NHtaosWiQikDx1Qu66RYlaRJg+ReFQxz0bjo3ew03iIMC+hxF8FK5Fbffx4zoQxjlZ3U 33ajP+IxNBh1GCvJqG3PT4VpJQiQVdnGQXEPtztBzPOaUM74nAs0VF+Cqksv4ACdphMd ZxASup2kdnSGIspONDSm5yXRF5Rw1+rZRUGIsh9PVKzOW2Dys0x8L2Cs4mLtO2rbn4hy Nz+yRcqvRf0gYBREhqw5+6jdmSwHolrgDuzd/J7gPtJKD1utejuhZdlf1FC6C0VjbD36 AFXA== 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=stSxE1BNbcB+u/wKP4s+2Ei9BunsyUMUezbX6iZbfwE=; b=At3pSMxqbYsj7E/wUmoAPrHPIaV0s7oZrdANHdAfC/QVPxAqKOeSTtR6GvGZppVe4L JlO0vCsY9YydDEVkdRwkIctKlm8mm2uDqNlKZ7H9YCtzZo0L9baAfHs6tYcYyCYoDmbY uV+a/nf1to4J1F3s1THIaLZoNffExaz2arLFbHCLbj7GRWINYFGisAPKyWvp0owlfAQm gXlER5Oz6r8pWHmSl/rVEHenIRhi9hvxeolxSasDWGXzqnc3S905BAlIe9Bu+DyAdcID Hhr5iUozhfKcKFrhstpem9VjEIfdN2H2422XVvzkVHfnOqA8i2KJ25LpK9gOqZJ/pIC8 J5Qg== X-Gm-Message-State: APjAAAVypN3aM4dguinqrmlGRrlPYnPPq7G2j8jgDo3RJRYq9Nq7iE9T d4TcM+2MkVw/AayE/i8KZ6+/uYLNxgE= X-Google-Smtp-Source: APXvYqxUtr1N/cAwqWCBf7Wk1Qg/4gc1Ef7QbwLShqgkj+ecNyX4qGwvg11in4pHsvnKwkTySFbaxA== X-Received: by 2002:a5d:514e:: with SMTP id u14mr228721wrt.69.1581098962773; Fri, 07 Feb 2020 10:09:22 -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 l17sm4196143wro.77.2020.02.07.10.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:09:22 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:28 +0100 Message-Id: <20200207180829.165689-10-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 09/10] package/rust: bump to 1.40 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: Patrick Havelange - remove of the llvm workaround patch as it is integrated in this newer version. - bump cargo-bin to 0.41 (corresponds to rust 1.40) and update licenses hashes. - bump rust-bin to 1.40. Signed-off-by: Patrick Havelange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Reviewed-by: David Pierret Tested-by: David Pierret --- package/cargo-bin/cargo-bin.hash | 22 +- package/cargo-bin/cargo-bin.mk | 2 +- package/rust-bin/rust-bin.hash | 90 +++--- package/rust-bin/rust-bin.mk | 2 +- ...esence-of-LLVM-library-in-stage0-lib.patch | 264 ------------------ package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 7 files changed, 62 insertions(+), 326 deletions(-) delete mode 100644 package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash index 0e9e9c5c61..22cad3c0ee 100644 --- a/package/cargo-bin/cargo-bin.hash +++ b/package/cargo-bin/cargo-bin.hash @@ -1,13 +1,13 @@ -# From https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 13acdb3c9f2505805ceed8a696f5f62ab8cd73e443cd43d6edd588aad88e1c32 cargo-0.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 6628db22370f397676195555d768f0449a60f0a694bcac24611f4cd1cfc97cdc cargo-0.33.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 c2c31db68c4dcb50ad856a19e6f11489a0d4df1212f31bd068dfbb73c5425761 cargo-0.33.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 c48bc132f4025ff39b1b6dc52aef9d406c3f926ce05fe92d943ceab7a5fd6058 cargo-0.41.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 7705f21d938a72ba6f01818661b2dea29183209940a335f18d1761e1e03d3710 cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated -sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE +sha256 8ada45cd9f843acf64e4722ae262c622a2b3b3007c7310ef36ac1061a30f6adb LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880 LICENSE-THIRD-PARTY +sha256 cbc759b1f17a2ac38fe3eb9e9563b1a08ba0f900611c49faaf68b46907b6d898 LICENSE-THIRD-PARTY diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk index 3eaf417531..246fdbf856 100644 --- a/package/cargo-bin/cargo-bin.mk +++ b/package/cargo-bin/cargo-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -CARGO_BIN_VERSION = 0.33.0 +CARGO_BIN_VERSION = 0.41.0 CARGO_BIN_SITE = https://static.rust-lang.org/dist CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz CARGO_BIN_LICENSE = Apache-2.0 or MIT diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 96d81a347c..12195f2911 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,48 +1,48 @@ -# From https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 90b6414eddbce4a245cdcaea8353d3a637ef565d2bd119e25a6c2bf3e38cdf63 rustc-1.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1 rustc-1.33.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 3e3449dada8306b3ff91f23c7803c7312a47e93af140f757b29b74f1e226a505 rust-std-1.33.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 ddb372a43fb2ba9949e78643df43d6ae447b70cefd440ccdd6b9f6c2ff929ea7 rust-std-1.33.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 1142d5064d8cbfab16ab71130e5a84804a1ebdfeb10173e6238adc0d757937b6 rust-std-1.33.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8492b5c91a9ea7ee7e22881382c1b9ad8bb9a4147aff0dfee09940b34783e3d5 rust-std-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 e945dd37ab9b143dbcbcdbeaba63b8de47411a4ff815d2e178f745e183078127 rust-std-1.33.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 abf6b7050c1cdef092ecfde5128067434bb7989def19cfe95c06bfd71de07ba0 rust-std-1.33.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 9cad816c989c991ffd342d03956b54209d7d32743ebb9b0624b2d36d5bbd525f rust-std-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 c7ac98e7a7c3757b5bb8bde596455d50a8787236e290bc1f49e2d59d486ae564 rust-std-1.33.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 4ec3cade12e2e527f81d0b315e6a37152bf73938aab4a9216aef7d06ef913eb6 rust-std-1.33.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 0ab78e0cb710f35d108abce90bbf426947fed6222d2f6c04c9eba4ca00adea06 rust-std-1.33.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 4bc32bf4660a9fc5cd2af9e09f1bfb668b335442097fed6f3892b50950e97d3c rust-std-1.33.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 984d3ca2a47db04345a2bddd657761f66d209ef95a02097ad4bd549f45a0dc9f rust-std-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e rust-std-1.33.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 257e4789043098a5e3b4fa85ea988019f37d640a10f83d39ada00fb23e057b8a rustc-1.40.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111 rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 1abd1865e8339c2cac6992a11f6f98b66fa2b97f67acaddcf1992e39a7001bfc rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 14bd261dfc586dc8e1cb336b3c58b63de2af4881c970dd9b1e87f1364a866bcb rust-std-1.40.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 f16b2cf9103127140f85d21c2753d85d45b90a9309967e3a788867fd7d95a6c1 rust-std-1.40.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 9d4aad78db894a76e9682f2095ac024cc4748b2933f9f7248bf571923f7693c4 rust-std-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 beab29565d12a6b9db4ef471c34d4c034295760095f7edc3f7b6c51fc08589a0 rust-std-1.40.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 c25790d43e0a01e5f45607b067b22ae96163d5eae877cee1b2b35ce0d43ab9b5 rust-std-1.40.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 7000ab95cd64f177af831d8880b9a5d7b5a23e5a18b9e9adab32bf90859bfa4e rust-std-1.40.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 9a4cfebee845dfd50f0f10c3019b89af3747c3aed1a797042285f3cea5a3eb30 rust-std-1.40.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 ab738a37c1cac1aaec7cb34556fa9bfff46dc912baf360a27e9d81311120ec4a rust-std-1.40.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 5c29b326d4d564c9fa9b82292890f47794496d3cedf106f83f935189b7ecaca5 rust-std-1.40.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 da7af341b3a01f684a2d9fea23f098816aa8a0f9588b58d25ec7f0622743b5b0 rust-std-1.40.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 4eb3141fb6c3d3e101b5d4493664c9a01d4bb9eebdf4b96f5c26a81188c2452d rust-std-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 5a0b14a51f51b0194f70a2023749d9cb49c3b2e11f0d4c8232960b91fad336ac rust-std-1.40.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index bef3102450..a5966768a4 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_BIN_VERSION = 1.33.0 +RUST_BIN_VERSION = 1.40.0 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch b/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch deleted file mode 100644 index 0c756e3028..0000000000 --- a/package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch +++ /dev/null @@ -1,264 +0,0 @@ -From 2d21df8a3fd7a68ba9f52389ead7f06f13190c12 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov -Date: Mon, 21 Jan 2019 17:47:57 -0700 -Subject: [PATCH] Workaround presence of LLVM library in stage0/lib - -This commit works around the newly-introduced LLVM shared library. - -This is needed such that llvm-config run from -librustc_llvm's build script can correctly locate it's own LLVM, not the -one in stage0/lib. The LLVM build system uses the DT_RUNPATH/RUNPATH -header within the llvm-config binary, which we want to use, but because -Cargo always adds the host compiler's "libdir" (stage0/lib in our -case) to the dynamic linker's search path, we weren't properly finding -the freshly-built LLVM in llvm/lib. By restoring the environment -variable setting the search path to what bootstrap sees, the problem is -resolved and librustc_llvm correctly links and finds the appropriate -LLVM. - -Several run-make-fulldeps tests are also updated with similar handling. - -Signed-off-by: Eric Le Bihan ---- - src/bootstrap/builder.rs | 9 ++++++++- - src/bootstrap/compile.rs | 1 + - src/bootstrap/util.rs | 6 +++++- - src/build_helper/lib.rs | 19 +++++++++++++++++++ - src/librustc_asan/build.rs | 2 ++ - src/librustc_llvm/build.rs | 2 ++ - src/librustc_lsan/build.rs | 2 ++ - src/librustc_msan/build.rs | 2 ++ - src/librustc_tsan/build.rs | 2 ++ - .../cross-lang-lto-upstream-rlibs/Makefile | 4 ++-- - .../run-make-fulldeps/cross-lang-lto/Makefile | 19 ++++++++++--------- - 11 files changed, 55 insertions(+), 13 deletions(-) - -diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index a69ba20749..f742bce180 100644 ---- a/src/bootstrap/builder.rs -+++ b/src/bootstrap/builder.rs -@@ -21,7 +21,7 @@ use crate::install; - use crate::native; - use crate::test; - use crate::tool; --use crate::util::{add_lib_path, exe, libdir}; -+use crate::util::{self, add_lib_path, exe, libdir}; - use crate::{Build, DocTests, Mode, GitRepo}; - - pub use crate::Compiler; -@@ -791,6 +791,13 @@ impl<'a> Builder<'a> { - .env("CARGO_TARGET_DIR", out_dir) - .arg(cmd); - -+ // See comment in librustc_llvm/build.rs for why this is necessary, largely llvm-config -+ // needs to not accidentally link to libLLVM in stage0/lib. -+ cargo.env("REAL_LIBRARY_PATH_VAR", &util::dylib_path_var()); -+ if let Some(e) = env::var_os(util::dylib_path_var()) { -+ cargo.env("REAL_LIBRARY_PATH", e); -+ } -+ - if cmd != "install" { - cargo.arg("--target") - .arg(target); -diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs -index b581271663..ec04dee6c3 100644 ---- a/src/bootstrap/compile.rs -+++ b/src/bootstrap/compile.rs -@@ -712,6 +712,7 @@ pub fn build_codegen_backend(builder: &Builder, - if builder.is_rust_llvm(target) && backend != "emscripten" { - cargo.env("LLVM_RUSTLLVM", "1"); - } -+ - cargo.env("LLVM_CONFIG", &llvm_config); - if backend != "emscripten" { - let target_config = builder.config.target_config.get(&target); -diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs -index 2880f1a084..37c6c040da 100644 ---- a/src/bootstrap/util.rs -+++ b/src/bootstrap/util.rs -@@ -70,7 +70,11 @@ pub fn dylib_path_var() -> &'static str { - /// Parses the `dylib_path_var()` environment variable, returning a list of - /// paths that are members of this lookup path. - pub fn dylib_path() -> Vec { -- env::split_paths(&env::var_os(dylib_path_var()).unwrap_or_default()).collect() -+ let var = match env::var_os(dylib_path_var()) { -+ Some(v) => v, -+ None => return vec![], -+ }; -+ env::split_paths(&var).collect() - } - - /// `push` all components to `buf`. On windows, append `.exe` to the last component. -diff --git a/src/build_helper/lib.rs b/src/build_helper/lib.rs -index 5a704e5577..c66c5c9249 100644 ---- a/src/build_helper/lib.rs -+++ b/src/build_helper/lib.rs -@@ -23,6 +23,25 @@ macro_rules! t { - }; - } - -+// Because Cargo adds the compiler's dylib path to our library search path, llvm-config may -+// break: the dylib path for the compiler, as of this writing, contains a copy of the LLVM -+// shared library, which means that when our freshly built llvm-config goes to load it's -+// associated LLVM, it actually loads the compiler's LLVM. In particular when building the first -+// compiler (i.e., in stage 0) that's a problem, as the compiler's LLVM is likely different from -+// the one we want to use. As such, we restore the environment to what bootstrap saw. This isn't -+// perfect -- we might actually want to see something from Cargo's added library paths -- but -+// for now it works. -+pub fn restore_library_path() { -+ println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH_VAR"); -+ println!("cargo:rerun-if-env-changed=REAL_LIBRARY_PATH"); -+ let key = env::var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR"); -+ if let Some(env) = env::var_os("REAL_LIBRARY_PATH") { -+ env::set_var(&key, &env); -+ } else { -+ env::remove_var(&key); -+ } -+} -+ - pub fn run(cmd: &mut Command) { - println!("running: {:?}", cmd); - run_silent(cmd); -diff --git a/src/librustc_asan/build.rs b/src/librustc_asan/build.rs -index 2d921b6669..b42d775deb 100644 ---- a/src/librustc_asan/build.rs -+++ b/src/librustc_asan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("asan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_llvm/build.rs b/src/librustc_llvm/build.rs -index ec3dff783c..cd91fcb299 100644 ---- a/src/librustc_llvm/build.rs -+++ b/src/librustc_llvm/build.rs -@@ -24,6 +24,8 @@ fn main() { - return; - } - -+ build_helper::restore_library_path(); -+ - let target = env::var("TARGET").expect("TARGET was not set"); - let llvm_config = env::var_os("LLVM_CONFIG") - .map(PathBuf::from) -diff --git a/src/librustc_lsan/build.rs b/src/librustc_lsan/build.rs -index 470f2bb3e5..ad528bb039 100644 ---- a/src/librustc_lsan/build.rs -+++ b/src/librustc_lsan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("lsan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_msan/build.rs b/src/librustc_msan/build.rs -index e1140278f2..085514b5a0 100644 ---- a/src/librustc_msan/build.rs -+++ b/src/librustc_msan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("msan") { - Ok(native) => native, - _ => return, -diff --git a/src/librustc_tsan/build.rs b/src/librustc_tsan/build.rs -index f63bb46b87..0db3db392d 100644 ---- a/src/librustc_tsan/build.rs -+++ b/src/librustc_tsan/build.rs -@@ -8,6 +8,8 @@ use cmake::Config; - - fn main() { - if let Some(llvm_config) = env::var_os("LLVM_CONFIG") { -+ build_helper::restore_library_path(); -+ - let (native, target) = match sanitizer_lib_boilerplate("tsan") { - Ok(native) => native, - _ => return, -diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -index 0a6f226a02..6992dab1a1 100644 ---- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -+++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile -@@ -9,7 +9,7 @@ all: staticlib.rs upstream.rs - - # Check No LTO - $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -L. -o $(TMPDIR)/staticlib.a -- (cd $(TMPDIR); llvm-ar x ./staticlib.a) -+ (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) - # Make sure the upstream object file was included - ls $(TMPDIR)/upstream.*.rcgu.o - -@@ -19,5 +19,5 @@ all: staticlib.rs upstream.rs - # Check ThinLTO - $(RUSTC) upstream.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin - $(RUSTC) staticlib.rs -Z cross-lang-lto -Ccodegen-units=1 -Clto=thin -L. -o $(TMPDIR)/staticlib.a -- (cd $(TMPDIR); llvm-ar x ./staticlib.a) -+ (cd $(TMPDIR); $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x ./staticlib.a) - ls $(TMPDIR)/upstream.*.rcgu.o -diff --git a/src/test/run-make-fulldeps/cross-lang-lto/Makefile b/src/test/run-make-fulldeps/cross-lang-lto/Makefile -index 1d072e03de..4d1fb7b953 100644 ---- a/src/test/run-make-fulldeps/cross-lang-lto/Makefile -+++ b/src/test/run-make-fulldeps/cross-lang-lto/Makefile -@@ -5,8 +5,9 @@ - # LLVM bitcode files (as used by linker LTO plugins) when compiling with - # -Z cross-lang-lto. - --ASSERT_IS_BITCODE_OBJ=llvm-bcanalyzer # this only succeeds for bitcode files --EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; llvm-ar x $(1)) -+# this only succeeds for bitcode files -+ASSERT_IS_BITCODE_OBJ=($(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-bcanalyzer $(1)) -+EXTRACT_OBJS=(cd $(TMPDIR); rm -f ./*.o; $(LD_LIB_PATH_ENVVAR)=$(REAL_LD_LIBRARY_PATH) llvm-ar x $(1)) - - BUILD_LIB=$(RUSTC) lib.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 - BUILD_EXE=$(RUSTC) main.rs -Copt-level=2 -Z cross-lang-lto=on -Ccodegen-units=1 --emit=obj -@@ -16,31 +17,31 @@ all: staticlib staticlib-fat-lto staticlib-thin-lto rlib exe cdylib rdylib - staticlib: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib.a - $(call EXTRACT_OBJS, liblib.a) -- for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - staticlib-fat-lto: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-fat-lto.a -Clto=fat - $(call EXTRACT_OBJS, liblib-fat-lto.a) -- for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib-fat-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - staticlib-thin-lto: lib.rs - $(BUILD_LIB) --crate-type=staticlib -o $(TMPDIR)/liblib-thin-lto.a -Clto=thin - $(call EXTRACT_OBJS, liblib-thin-lto.a) -- for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib-thin-lto.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - rlib: lib.rs - $(BUILD_LIB) --crate-type=rlib -o $(TMPDIR)/liblib.rlib - $(call EXTRACT_OBJS, liblib.rlib) -- for file in $(TMPDIR)/liblib.*.rcgu.o; do $(ASSERT_IS_BITCODE_OBJ) $$file; done -+ for file in $(TMPDIR)/liblib.*.rcgu.o; do $(call ASSERT_IS_BITCODE_OBJ, $$file); done - - cdylib: lib.rs - $(BUILD_LIB) --crate-type=cdylib --emit=obj -o $(TMPDIR)/cdylib.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/cdylib.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/cdylib.o) - - rdylib: lib.rs - $(BUILD_LIB) --crate-type=dylib --emit=obj -o $(TMPDIR)/rdylib.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/rdylib.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/rdylib.o) - - exe: lib.rs - $(BUILD_EXE) -o $(TMPDIR)/exe.o -- $(ASSERT_IS_BITCODE_OBJ) $(TMPDIR)/exe.o -+ $(call ASSERT_IS_BITCODE_OBJ, $(TMPDIR)/exe.o) --- -2.17.2 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 62e2e1855c..67c537f670 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.33.0-src.tar.xz.asc -sha256 f4b1a72f1a29b23dcc9d7be5f60878f0434560513273906aa93dcd5c0de39b71 rustc-1.33.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-src.tar.xz.asc +sha256 6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace rustc-1.40.0-src.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 588e1088f8..cc3cf1bd01 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.33.0 +RUST_VERSION = 1.40.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From patchwork Fri Feb 7 18:08:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnout Vandecappelle X-Patchwork-Id: 1235099 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=NB8B+oCZ; 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 48DjyK2LCdz9sRh for ; Sat, 8 Feb 2020 05:10:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CCE2F86DCC; Fri, 7 Feb 2020 18:10:15 +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 geDosT6eosKC; Fri, 7 Feb 2020 18:10:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7E2A886477; Fri, 7 Feb 2020 18:10:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CFB341BF38E for ; Fri, 7 Feb 2020 18:09:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C4882824E3 for ; Fri, 7 Feb 2020 18:09:31 +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 ydxue+x1YYM2 for ; Fri, 7 Feb 2020 18:09:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7B29481FD3 for ; Fri, 7 Feb 2020 18:09:30 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id t3so3747172wru.7 for ; Fri, 07 Feb 2020 10:09:30 -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=0k4smqZRroyKd+MZHcEPa7FnqiccZ+YwTIHFifZb1iw=; b=NB8B+oCZ3FpvrsA2TPHB3+yg+nZqetvPc2J2QLXxagM3MDoJpmTAAL3hAYr0Hi3maa 4gTdTWM9TairoDzpd7uwURFOhuqK8J1s+m3ruH9qwN9rJgPVbZZmxCod6TMcNQEiItkB BGUBlA+eRPcXWn5uyobjx4EEsPKfokjC+h4Q0B7/UHi8nesURq1+oKamVeFM5bz4sApD VUwhLIgL0DcZ+Xox7g/nkEafnHiRBOtjW1SjQ1DMFvnHqwUrj4xdydbesC74ZOp6EPd2 RFvEyT9LxvX4LM3zxwsE8zY9I+1+1xz6lJTMfST4Mjgq757FSP9yZwsq1jKHAj2hVHa5 61AA== 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=0k4smqZRroyKd+MZHcEPa7FnqiccZ+YwTIHFifZb1iw=; b=GqgjZuNNNA0Aru0WAWmoaEHuaFY/6F7tV4WtIYPjgiuM/NpR/y9q9jbdEiNcDeQXrg WcJilAnaR1ddoCq0jHjvWO3ZPfDp+H4+S2TneSDMSABUTqiiKgMgp2MpsO63/IeXuLWm 7cLkqRrX+CCFCokZTPYOvVvjcC8s65VUatLqvUnv14EavNPAMv35BK7Ybzgc9QP/pKxb prypV8l0VXg3unehCrTrT/NV+85B/M7yXWK/zNgSe2JteEMTd/kpAl7t38TPg0K0qc6x tkjTCjTUBXxMrG1mdlPPefrCavXp9serSqloVqI6u4vpwBrrZkQaB2OBKq2jjU6kbFNp QQGg== X-Gm-Message-State: APjAAAXzQIQc8pVviXrgFiaEtz6mKAMNz06mFiyx7KSJ1CiNFikz6e4Z qjXyOUjSV5TZj3HT3444XE82sDgvSPg= X-Google-Smtp-Source: APXvYqzBDlo1ZUVmb75E0hCiRTxPCq1cvuKK9TubOm/x8kddTk3BgMlJldsFuJufaxnT01HmfbkPHQ== X-Received: by 2002:a5d:4fce:: with SMTP id h14mr315354wrw.60.1581098968684; Fri, 07 Feb 2020 10:09:28 -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 t10sm4263487wmi.40.2020.02.07.10.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2020 10:09:28 -0800 (PST) From: "Arnout Vandecappelle (Essensium/Mind)" To: buildroot@buildroot.org Date: Fri, 7 Feb 2020 19:08:29 +0100 Message-Id: <20200207180829.165689-11-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 10/10] package/cargo-bin: remove and use cargo-bin from rust-bin package 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: Patrick Havelange Rust upstream distributes tarballs with separate rust and cargo binaries, but also tarballs with everything together. The latter contains a bit more than what we need, so the download is slightly larger than separate cargo-bin and rust-bin. But it simplifies our life if we do the same in rust-bin as in rust (i.e. get both rust and cargo). Also added hashes for rust-bin powerpc64le, which was missing before. Signed-off-by: Patrick Havelange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: David Pierret --- DEVELOPERS | 1 - package/cargo-bin/cargo-bin.hash | 13 ------------- package/cargo-bin/cargo-bin.mk | 19 ------------------- package/rust-bin/rust-bin.hash | 15 +++++++++------ package/rust-bin/rust-bin.mk | 28 ++++++++++++---------------- package/rust/rust.mk | 2 +- 6 files changed, 22 insertions(+), 56 deletions(-) delete mode 100644 package/cargo-bin/cargo-bin.hash delete mode 100644 package/cargo-bin/cargo-bin.mk diff --git a/DEVELOPERS b/DEVELOPERS index e0f6e7278c..ace16c06e6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -708,7 +708,6 @@ F: package/gstreamer1/gst1-plugins-bayer2rgb-neon/ N: Eric Le Bihan F: docs/manual/adding-packages-meson.txt F: package/adwaita-icon-theme/ -F: package/cargo-bin/ F: package/darkhttpd/ F: package/eudev/ F: package/execline/ diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash deleted file mode 100644 index 22cad3c0ee..0000000000 --- a/package/cargo-bin/cargo-bin.hash +++ /dev/null @@ -1,13 +0,0 @@ -# From https://static.rust-lang.org/dist/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 c48bc132f4025ff39b1b6dc52aef9d406c3f926ce05fe92d943ceab7a5fd6058 cargo-0.41.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 7705f21d938a72ba6f01818661b2dea29183209940a335f18d1761e1e03d3710 cargo-0.41.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 9b6ae643fa240c5ecbc1dc390f4020b6a683f25bac6f7437ebd4b9d32a8d0b6c cargo-0.41.0-x86_64-unknown-linux-gnu.tar.xz -# Locally generated -sha256 8ada45cd9f843acf64e4722ae262c622a2b3b3007c7310ef36ac1061a30f6adb LICENSE-APACHE -sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT -sha256 cbc759b1f17a2ac38fe3eb9e9563b1a08ba0f900611c49faaf68b46907b6d898 LICENSE-THIRD-PARTY diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk deleted file mode 100644 index 246fdbf856..0000000000 --- a/package/cargo-bin/cargo-bin.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# cargo-bin -# -################################################################################ - -CARGO_BIN_VERSION = 0.41.0 -CARGO_BIN_SITE = https://static.rust-lang.org/dist -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)) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 12195f2911..1fdce9ad6f 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,9 +1,12 @@ -# From https://static.rust-lang.org/dist/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 257e4789043098a5e3b4fa85ea988019f37d640a10f83d39ada00fb23e057b8a rustc-1.40.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 b1c00618b7a98156e88b14682508a503284f85748eab23de749a20dcc8847111 rustc-1.40.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.40.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.40.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 82454e1b60b2bc24779d9c949cc0e1da43f3e423dbfc6b45b5afddf65829fc9d rust-1.40.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 37492d6467bcea611b2c7388aed50b655524f81410e255142ef6cfb6cef1ec53 rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 82454e1b60b2bc24779d9c949cc0e1da43f3e423dbfc6b45b5afddf65829fc9d rust-1.40.0-powerpc64le-unknown-linux-gnu.tar.xz # From https://static.rust-lang.org/dist/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.sha256 # Verified using https://static.rust-lang.org/dist/rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz.asc sha256 1abd1865e8339c2cac6992a11f6f98b66fa2b97f67acaddcf1992e39a7001bfc rust-std-1.40.0-aarch64-unknown-linux-gnu.tar.xz diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index a5966768a4..be8d623aa2 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -10,18 +10,14 @@ RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT HOST_RUST_BIN_PROVIDES = host-rustc -HOST_RUST_BIN_DEPENDENCIES = host-cargo-bin -HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz - -HOST_RUST_BIN_EXTRA_DOWNLOADS = \ - rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz +HOST_RUST_BIN_SOURCE = rust-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) -HOST_RUST_BIN_EXTRA_DOWNLOADS += rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME).tar.xz +HOST_RUST_BIN_EXTRA_DOWNLOADS = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME).tar.xz endif -HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME)/rust-std-$(RUSTC_HOST_NAME) +HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUSTC_HOST_NAME) define HOST_RUST_BIN_LIBSTD_EXTRACT mkdir -p $(@D)/std @@ -31,36 +27,36 @@ define HOST_RUST_BIN_LIBSTD_EXTRACT ) mkdir -p $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib cd $(@D)/rustc/lib/rustlib/$(RUSTC_HOST_NAME)/lib; \ - ln -sf ../../../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . + ln -sf ../../../../../$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)/lib/* . endef HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT -HOST_RUST_BIN_INSTALL_OPTS = \ +HOST_RUST_BIN_INSTALL_COMMON_OPTS = \ --prefix=$(HOST_DIR) \ --disable-ldconfig +HOST_RUST_BIN_INSTALL_OPTS = \ + $(HOST_RUST_BIN_INSTALL_COMMON_OPTS) \ + --components=rustc,cargo,rust-std-$(RUSTC_HOST_NAME) + define HOST_RUST_BIN_INSTALL_RUSTC (cd $(@D); \ ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) endef -define HOST_RUST_BIN_INSTALL_LIBSTD_HOST - (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME); \ - ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) -endef - ifeq ($(BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS),y) define HOST_RUST_BIN_INSTALL_LIBSTD_TARGET (cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME); \ - ./install.sh $(HOST_RUST_BIN_INSTALL_OPTS)) + ./install.sh $(HOST_RUST_BIN_INSTALL_COMMON_OPTS)) endef endif define HOST_RUST_BIN_INSTALL_CMDS $(HOST_RUST_BIN_INSTALL_RUSTC) - $(HOST_RUST_BIN_INSTALL_LIBSTD_HOST) $(HOST_RUST_BIN_INSTALL_LIBSTD_TARGET) endef +HOST_RUST_BIN_POST_INSTALL_HOOKS += HOST_RUST_INSTALL_CARGO_CONFIG + $(eval $(host-generic-package)) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index cc3cf1bd01..a81aa6dc2b 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -41,7 +41,7 @@ define HOST_RUST_CONFIGURE_CMDS ( \ echo '[build]'; \ echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \ - echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \ + echo 'cargo = "$(HOST_RUST_BIN_DIR)/cargo/bin/cargo"'; \ echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \ echo 'python = "$(HOST_DIR)/bin/python2"'; \ echo 'submodules = false'; \