From patchwork Wed Jul 24 22:12:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Le Bihan X-Patchwork-Id: 1136571 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr 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 45v8j66r03z9sMr for ; Thu, 25 Jul 2019 08:12:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 38A8C20114; Wed, 24 Jul 2019 22:12:23 +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 qEv5ESxxNwLM; Wed, 24 Jul 2019 22:12:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 3465A20523; Wed, 24 Jul 2019 22:12:20 +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 C53D31BF5DC for ; Wed, 24 Jul 2019 22:12:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C30AC8489F for ; Wed, 24 Jul 2019 22:12:17 +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 yqG0Ax8Rie6K for ; Wed, 24 Jul 2019 22:12:16 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by whitealder.osuosl.org (Postfix) with ESMTPS id 29F6981AE6 for ; Wed, 24 Jul 2019 22:12:16 +0000 (UTC) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:174:1c70:ae7b:a1ff:fec0:c2c7]) (Authenticated sender: eric.le.bihan.dev) by smtp6-g21.free.fr (Postfix) with ESMTPSA id 3AC9678034D for ; Wed, 24 Jul 2019 22:12:12 +0000 (UTC) From: Eric Le Bihan To: buildroot@buildroot.org Date: Thu, 25 Jul 2019 00:12:03 +0200 Message-Id: <20190724221207.9686-3-eric.le.bihan.dev@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> References: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/6] package/cargo-bin: declare as cargo provider 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" If cargo-bin is explicitly selected, then install binary in $(HOST_DIR) and declare package as cargo provider. Signed-off-by: Eric Le Bihan --- package/cargo-bin/cargo-bin.mk | 8 ++++++++ package/cargo/Config.in.host | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk index 3614f7a53d..809bb64cae 100644 --- a/package/cargo-bin/cargo-bin.mk +++ b/package/cargo-bin/cargo-bin.mk @@ -9,5 +9,13 @@ 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 +CARGO_BIN_PROVIDES = host-cargo + +ifeq ($(BR2_PACKAGE_HOST_CARGO_BIN),y) +define HOST_CARGO_BIN_INSTALL_CMDS + $(@D)/install.sh --prefix=$(HOST_DIR) --disable-ldconfig +endef +HOST_CARGO_BIN_POST_INSTALL_HOOKS += HOST_CARGO_INSTALL_CONFIG +endif $(eval $(host-generic-package)) diff --git a/package/cargo/Config.in.host b/package/cargo/Config.in.host index 82652fa980..bae30d2f57 100644 --- a/package/cargo/Config.in.host +++ b/package/cargo/Config.in.host @@ -7,10 +7,29 @@ config BR2_PACKAGE_HOST_CARGO https://crates.io/ +if BR2_PACKAGE_HOST_CARGO + +choice + prompt "Cargo provider" + help + Select a Cargo package manager provider + +config BR2_PACKAGE_HOST_CARGO_BIN + bool "host cargo (pre-built)" + depends on BR2_PACKAGE_HOST_RUST_BIN + select BR2_PACKAGE_HAS_HOST_CARGO + help + This package will install a pre-built version of Cargo. + +endchoice + +endif + config BR2_PACKAGE_HAS_HOST_CARGO bool config BR2_PACKAGE_PROVIDES_HOST_CARGO string depends on BR2_PACKAGE_HAS_HOST_CARGO + default "host-cargo-bin" if !BR2_PACKAGE_HOST_RUST depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS From patchwork Wed Jul 24 22:12:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Le Bihan X-Patchwork-Id: 1136574 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr 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 45v8jH5v4tz9s8m for ; Thu, 25 Jul 2019 08:12:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BFAF121FA8; Wed, 24 Jul 2019 22:12:32 +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 7hTjZRR+G1St; Wed, 24 Jul 2019 22:12:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2938A214E9; Wed, 24 Jul 2019 22:12:21 +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 C55BB1BF5DC for ; Wed, 24 Jul 2019 22:12:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C2F7A85F68 for ; Wed, 24 Jul 2019 22:12:18 +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 00EkG6aIHY-I for ; Wed, 24 Jul 2019 22:12:18 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 32A5F85D97 for ; Wed, 24 Jul 2019 22:12:18 +0000 (UTC) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:174:1c70:ae7b:a1ff:fec0:c2c7]) (Authenticated sender: eric.le.bihan.dev) by smtp6-g21.free.fr (Postfix) with ESMTPSA id 9002B780316 for ; Wed, 24 Jul 2019 22:12:14 +0000 (UTC) From: Eric Le Bihan To: buildroot@buildroot.org Date: Thu, 25 Jul 2019 00:12:04 +0200 Message-Id: <20190724221207.9686-4-eric.le.bihan.dev@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> References: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/6] package/rust: declare as cargo provider 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Enable build of cargo along with Rust compiler and declare this package as a cargo provider. Signed-off-by: Eric Le Bihan --- package/cargo/Config.in.host | 8 ++++++++ package/rust/rust.mk | 23 ++++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/package/cargo/Config.in.host b/package/cargo/Config.in.host index bae30d2f57..d1bb913573 100644 --- a/package/cargo/Config.in.host +++ b/package/cargo/Config.in.host @@ -14,6 +14,13 @@ choice help Select a Cargo package manager provider +config BR2_PACKAGE_HOST_RUST_CARGO + bool "host rust" + depends on BR2_PACKAGE_HOST_RUST + select BR2_PACKAGE_HAS_HOST_CARGO + help + Install Cargo built at the same time as the Rust compiler. + config BR2_PACKAGE_HOST_CARGO_BIN bool "host cargo (pre-built)" depends on BR2_PACKAGE_HOST_RUST_BIN @@ -32,4 +39,5 @@ config BR2_PACKAGE_PROVIDES_HOST_CARGO string depends on BR2_PACKAGE_HAS_HOST_CARGO default "host-cargo-bin" if !BR2_PACKAGE_HOST_RUST + default "host-rust" if BR2_PACKAGE_HOST_RUST depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 5d14fc6682..ff23cd8930 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -10,7 +10,7 @@ RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT RUST_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT -HOST_RUST_PROVIDES = host-rustc +HOST_RUST_PROVIDES = host-rustc host-cargo HOST_RUST_DEPENDENCIES = \ toolchain \ @@ -38,6 +38,25 @@ endef HOST_RUST_POST_EXTRACT_HOOKS += HOST_RUST_EXCLUDE_ORIG_FILES +ifeq ($(BR2_PACKAGE_HOST_RUST_CARGO),y) + +define HOST_RUST_ENABLE_CARGO + echo 'extended = true'; \ + echo 'tools = ["cargo"]'; +endef + +define HOST_RUST_INSTALL_CARGO + find $(@D)/build/tmp/dist -maxdepth 2 -wholename '*cargo*/install.sh' \ + -exec {} --prefix=$(HOST_DIR) --disable-ldconfig \; + +endef + +HOST_RUST_POST_INSTALL_HOOKS += \ + HOST_RUST_INSTALL_CARGO \ + HOST_CARGO_INSTALL_CONFIG + +endif + define HOST_RUST_CONFIGURE_CMDS ( \ echo '[build]'; \ @@ -47,11 +66,13 @@ define HOST_RUST_CONFIGURE_CMDS echo 'python = "$(HOST_DIR)/bin/python2"'; \ echo 'submodules = false'; \ echo 'vendor = true'; \ + $(HOST_RUST_ENABLE_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 Wed Jul 24 22:12:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Le Bihan X-Patchwork-Id: 1136569 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr 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 45v8j65mg0z9s8m for ; Thu, 25 Jul 2019 08:12:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7685F87E98; Wed, 24 Jul 2019 22:12:23 +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 s4X2JaHJCXQE; Wed, 24 Jul 2019 22:12:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id D527787E99; Wed, 24 Jul 2019 22:12:22 +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 6DE351BF5DC for ; Wed, 24 Jul 2019 22:12:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 68B408489F for ; Wed, 24 Jul 2019 22:12:21 +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 DXVorIccJbNN for ; Wed, 24 Jul 2019 22:12:20 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8BEAC81AE6 for ; Wed, 24 Jul 2019 22:12:20 +0000 (UTC) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:174:1c70:ae7b:a1ff:fec0:c2c7]) (Authenticated sender: eric.le.bihan.dev) by smtp6-g21.free.fr (Postfix) with ESMTPSA id E86947802D7 for ; Wed, 24 Jul 2019 22:12:16 +0000 (UTC) From: Eric Le Bihan To: buildroot@buildroot.org Date: Thu, 25 Jul 2019 00:12:05 +0200 Message-Id: <20190724221207.9686-5-eric.le.bihan.dev@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> References: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 4/6] package/cargo-bin: bump version to 0.37.0 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Eric Le Bihan --- package/cargo-bin/cargo-bin.hash | 18 +++++++++--------- package/cargo-bin/cargo-bin.mk | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/cargo-bin/cargo-bin.hash b/package/cargo-bin/cargo-bin.hash index 0e9e9c5c61..c6df194b2f 100644 --- a/package/cargo-bin/cargo-bin.hash +++ b/package/cargo-bin/cargo-bin.hash @@ -1,12 +1,12 @@ -# 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.37.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.37.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 6835a73e2ce17e11eda5393133dd7c78bc41bae5a09784e5327648f14340fd48 cargo-0.37.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.37.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.37.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 4cda7686160f6981e936229703e8e2e756c74f390245f2ad9e356bbbed28a2c9 cargo-0.37.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/cargo-0.37.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/cargo-0.37.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 d20fa121951339d5492cf8862f8a7af59efc99d18f3c27b95ab6d4658b6a7d67 cargo-0.37.0-x86_64-unknown-linux-gnu.tar.xz # Locally generated sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2 LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/cargo-bin/cargo-bin.mk b/package/cargo-bin/cargo-bin.mk index 809bb64cae..534c023ffe 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.37.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 From patchwork Wed Jul 24 22:12:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Le Bihan X-Patchwork-Id: 1136573 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr 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 45v8jC60Ncz9s8m for ; Thu, 25 Jul 2019 08:12:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 88B0F87ED9; Wed, 24 Jul 2019 22:12: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 qejMkbBHXdaz; Wed, 24 Jul 2019 22:12:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 0182987EAE; Wed, 24 Jul 2019 22:12:25 +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 1648D1BF5DC for ; Wed, 24 Jul 2019 22:12:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1314D85D97 for ; Wed, 24 Jul 2019 22:12:24 +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 OGoMNuRYw_-U for ; Wed, 24 Jul 2019 22:12:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by fraxinus.osuosl.org (Postfix) with ESMTPS id CC2CE85F68 for ; Wed, 24 Jul 2019 22:12:22 +0000 (UTC) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:174:1c70:ae7b:a1ff:fec0:c2c7]) (Authenticated sender: eric.le.bihan.dev) by smtp6-g21.free.fr (Postfix) with ESMTPSA id 4B8F378032A for ; Wed, 24 Jul 2019 22:12:19 +0000 (UTC) From: Eric Le Bihan To: buildroot@buildroot.org Date: Thu, 25 Jul 2019 00:12:06 +0200 Message-Id: <20190724221207.9686-6-eric.le.bihan.dev@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> References: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 5/6] package/rust-bin: bump version to 1.36.0 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Eric Le Bihan --- package/rust-bin/rust-bin.hash | 90 +++++++++++++++++----------------- package/rust-bin/rust-bin.mk | 2 +- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index 96d81a347c..d48ae8e1c3 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.36.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.36.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 ad86a75cc8a02a0129df480ccb28082985215f4b5558a42881777691ae1d3ff3 rustc-1.36.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.36.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.36.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 fff0158da6f5af2a89936dc3e0c361077c06c2983eb310615e02f81ebbde1416 rustc-1.36.0-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 46c96cdca589e0b256e59370a6c9a1126f00cdd48b5659b638aa4dd7198b0406 rust-std-1.36.0-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 50d5d644045c035f5f851bdfd85dee1929fb1be6116760708c4c9505ce7ed924 rust-std-1.36.0-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 ba2b90d1ea64d5c4e86df5f4911c4eb6485c3874c3faa1ef56b2195d1ebcdae9 rust-std-1.36.0-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 f88a34f4e6ea2bedbd3a6dcc91641869eb0c87c7311dd8e4469fa6a93fe3b224 rust-std-1.36.0-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-i686-unknown-linux-gnu.tar.xz.asc +sha256 a78f7bdbce0a960f3334c6c639cbe96f05b9b74df26cda9a5161834098119217 rust-std-1.36.0-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-mips-unknown-linux-gnu.tar.xz.asc +sha256 94ea494feeb51b58c198e4e50772a0ab77d8911ddd4755990c37a2ceb0c1dd83 rust-std-1.36.0-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 5ff91bba1fc46ca46f4b300b08df65ddcffcf78a9768de15fccdbbcc18f4b36f rust-std-1.36.0-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 f6c33fa5ebdab91ca9540cfe46850481a9674913db11a47c398a2f4d924dc96d rust-std-1.36.0-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 0f37e339ae07a09f2e564cf57b978720a21520da781329b730569e4da5fc42af rust-std-1.36.0-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 b22c7104c1bea83aef920140a25be974c3e08dd600431901346908916be46f43 rust-std-1.36.0-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 886b723a04d52bd96c9470e72a568f86b9010d128b3c403d199bc1f50694dea3 rust-std-1.36.0-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 db7a9a06b8b1b84d6fe10bc1e2e136234e31bfaa77499b9df36e2d441ef1b856 rust-std-1.36.0-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.36.0-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.36.0-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 ce8e12684b568a8a4f7d346a743383429849cf3f028f5712ad3d3e31590c8db3 rust-std-1.36.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 a374215e20..cae3c1ced5 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.36.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 From patchwork Wed Jul 24 22:12:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Le Bihan X-Patchwork-Id: 1136575 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=free.fr 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 45v8jS4TlTz9s8m for ; Thu, 25 Jul 2019 08:12:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DCE532075B; Wed, 24 Jul 2019 22:12:42 +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 G-NS30BvynXz; Wed, 24 Jul 2019 22:12:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 072A62156F; Wed, 24 Jul 2019 22:12:28 +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 C53B41BF5DC for ; Wed, 24 Jul 2019 22:12:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C2D9385F68 for ; Wed, 24 Jul 2019 22:12:26 +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 YJRSqQFljLwb for ; Wed, 24 Jul 2019 22:12:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 17C2885D97 for ; Wed, 24 Jul 2019 22:12:25 +0000 (UTC) Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:174:1c70:ae7b:a1ff:fec0:c2c7]) (Authenticated sender: eric.le.bihan.dev) by smtp6-g21.free.fr (Postfix) with ESMTPSA id 8FD7B78032A for ; Wed, 24 Jul 2019 22:12:21 +0000 (UTC) From: Eric Le Bihan To: buildroot@buildroot.org Date: Thu, 25 Jul 2019 00:12:07 +0200 Message-Id: <20190724221207.9686-7-eric.le.bihan.dev@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> References: <20190724221207.9686-1-eric.le.bihan.dev@free.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 6/6] package/rust: bump version to 1.36.0 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Eric Le Bihan --- ...esence-of-LLVM-library-in-stage0-lib.patch | 264 ------------------ package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 3 files changed, 4 insertions(+), 268 deletions(-) delete mode 100644 package/rust/0001-Workaround-presence-of-LLVM-library-in-stage0-lib.patch 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..16962c6723 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.36.0-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.36.0-src.tar.xz.asc +sha256 f51645b9f787af4a5d94db17f6af39db0c55980ed24fe366cad55b57900f8f2d rustc-1.36.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 ff23cd8930..8aa7fe723b 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUST_VERSION = 1.33.0 +RUST_VERSION = 1.36.0 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT