Update to Rust 1.51.0 and remove 1.47.0

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Colin Finck
2021-03-25 17:32:40 +01:00
committed by Khem Raj
parent da00d57cda
commit 191cd91817
11 changed files with 32 additions and 33 deletions
@@ -1,4 +1,4 @@
From 40802c3a42fab9cfcd27fda8d00e98f8cc30016a Mon Sep 17 00:00:00 2001 From 9844e63845da6cdafa485ad1ad3c99eaaa80312d Mon Sep 17 00:00:00 2001
From: Johan Anderholm <johan.anderholm@gmail.com> From: Johan Anderholm <johan.anderholm@gmail.com>
Date: Sun, 27 Jan 2019 10:19:00 +0100 Date: Sun, 27 Jan 2019 10:19:00 +0100
Subject: [PATCH] Disable http2 Subject: [PATCH] Disable http2
@@ -14,18 +14,15 @@ Upstream-Status: Inappropriate
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index 95cea90c4..56211532f 100644 index 8a144a4..c4f856e 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -25,7 +25,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.1" } @@ -25,7 +25,7 @@ cargo-platform = { path = "crates/cargo-platform", version = "0.1.1" }
crates-io = { path = "crates/crates-io", version = "0.31.1" } crates-io = { path = "crates/crates-io", version = "0.33.0" }
crossbeam-utils = "0.7" crossbeam-utils = "0.8"
crypto-hash = "0.3.1" crypto-hash = "0.3.1"
-curl = { version = "0.4.23", features = ["http2"] } -curl = { version = "0.4.23", features = ["http2"] }
+curl = { version = "0.4.23" } +curl = { version = "0.4.23" }
curl-sys = "0.4.22" curl-sys = "0.4.22"
env_logger = "0.7.0" env_logger = "0.8.1"
pretty_env_logger = { version = "0.4", optional = true } pretty_env_logger = { version = "0.4", optional = true }
--
2.28.0
@@ -1,13 +0,0 @@
require rust-snapshot.inc
## This is information on the rust-snapshot (binary) used to build our current release.
## snapshot info is taken from rust/src/stage0.txt
## TODO: find a way to add additional SRC_URIs based on the contents of an
## earlier SRC_URI.
RS_VERSION = "1.46.0"
CARGO_VERSION = "0.47.0"
# TODO: Add hashes for other architecture toolchains as well. Make a script?
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c"
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "6edcec5367f9fcaee78cbcabfb1f6757fa95d7fd2c0853913223fe20ad534f12"
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "9da5c4888c6025fa174eaef330337e49666ca9562f876a34d40c03a80d432b8d"
@@ -0,0 +1,13 @@
require rust-snapshot.inc
## This is information on the rust-snapshot (binary) used to build our current release.
## snapshot info is taken from rust/src/stage0.txt
## TODO: find a way to add additional SRC_URIs based on the contents of an
## earlier SRC_URI.
RS_VERSION = "1.50.0"
CARGO_VERSION = "1.50.0"
# TODO: Add hashes for other architecture toolchains as well. Make a script?
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "f1eb68db2b28a56ed8701edba7cf3688011d903ca12ff9d85bd21d3f8f614792"
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "9bebd360bcd9b5bb58f2a02930b9db4ae291adef259c96377f1f4cbd240bcf86"
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "3cb2c68e987e5681fca9c930973f408a71151b1b255e69669a08e54d446ee803"
@@ -1,3 +0,0 @@
require rust-source.inc
SRC_URI[rust.sha256sum] = "ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2"
@@ -0,0 +1,3 @@
require rust-source.inc
SRC_URI[rust.sha256sum] = "92c68a91fca33cbafb83442cde722d010cc387dc1ee8a2680e2fb33a575821a1"
-9
View File
@@ -1,9 +0,0 @@
require rust-target.inc
require rust-source-${PV}.inc
require rust-snapshot-${PV}.inc
# The default behaviour of x.py changed in 1.47+ so now we need to
# explicitly ask for the stage 2 compiler to be assembled.
do_compile () {
rust_runx build --stage 2 src/rustc
}
+11
View File
@@ -0,0 +1,11 @@
require rust-target.inc
require rust-source-${PV}.inc
require rust-snapshot-${PV}.inc
do_compile () {
rust_runx build --stage 2
}
rust_do_install() {
rust_runx install
}