Update to 1.54.0.

Resolves: rhbz#1947202
2021-08-04 16:09:36 -07:00 · 2021-08-04 16:09:36 -07:00 · 46c1f2416f
commit 46c1f2416f
parent e1b8ce4dfb
6 changed files with 42 additions and 33 deletions
--- a/.gitignore
+++ b/.gitignore
@ -351,3 +351,9 @@
 /rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz
 /openssl-0.10.35.crate
 /openssl-sys-0.9.65.crate
+/rustc-1.54.0-src.tar.xz
+/rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz
+/rust-1.53.0-i686-unknown-linux-gnu.tar.xz
+/rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz
+/rust-1.53.0-s390x-unknown-linux-gnu.tar.xz
+/rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz
--- a/0001-Use-lld-provided-by-system-for-wasm.patch
+++ b/0001-Use-lld-provided-by-system-for-wasm.patch
@ -1,4 +1,4 @@
-From 3582a262d27fd5a2f8705bad6018241eaca8aadd Mon Sep 17 00:00:00 2001
+From 9ac837c237568a6c1c5f0e979fcce208cd9c926a Mon Sep 17 00:00:00 2001
 From: Ivan Mironov <mironov.ivan@gmail.com>
 Date: Sun, 8 Dec 2019 17:23:08 +0500
 Subject: [PATCH] Use lld provided by system for wasm
@ -8,10 +8,10 @@ Subject: [PATCH] Use lld provided by system for wasm
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
-index b208eb92f8ff..94a701a11c8b 100644
+index 4c954a1e567c..15c4f1bda5eb 100644
 --- a/compiler/rustc_target/src/spec/wasm_base.rs
 +++ b/compiler/rustc_target/src/spec/wasm_base.rs
-@@ -98,8 +98,7 @@ pub fn options() -> TargetOptions {
+@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions {
         // arguments just yet
         limit_rdylib_exports: false,
 
@ -19,8 +19,8 @@ index b208eb92f8ff..94a701a11c8b 100644
 -        linker: Some("rust-lld".to_owned()),
 +        linker: Some("lld".to_owned()),
         lld_flavor: LldFlavor::Wasm,
+         linker_is_gnu: false,
 
-         // No need for indirection here, simd types can always be passed by
 -- 
 2.31.1

--- a/rust-openssl-300.patch
+++ b/rust-openssl-300.patch
@ -1,33 +1,25 @@
--- rustc-1.53.0-src/Cargo.lock.orig	2021-06-16 20:53:50.000000000 -0700
-+++ rustc-1.53.0-src/Cargo.lock	2021-06-22 13:03:34.807302140 -0700
-@@ -2390,15 +2390,15 @@ dependencies = [
+--- rustc-1.54.0-src/Cargo.lock.orig	2021-07-26 07:43:01.000000000 -0700
+++ rustc-1.54.0-src/Cargo.lock	2021-08-04 16:01:15.723167826 -0700
+@@ -2408,9 +2408,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.30"
+-version = "0.10.33"
 +version = "0.10.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
+-checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"
 +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885"
 dependencies = [
  "bitflags",
- "cfg-if 0.1.10",
-+ "cfg-if 1.0.0",
-  "foreign-types",
- "lazy_static",
-  "libc",
-+ "once_cell",
-  "openssl-sys",
- ]
- 
-@@ -2419,9 +2419,9 @@ dependencies = [
+  "cfg-if 1.0.0",
+@@ -2437,9 +2437,9 @@ dependencies = [
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.58"
+-version = "0.9.61"
 +version = "0.9.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
+-checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"
 +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d"
 dependencies = [
  "autocfg",
--- a/rust.spec
+++ b/rust.spec
@ -9,10 +9,10 @@
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
 # Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.52.0
-%global bootstrap_cargo 1.52.0
-%global bootstrap_channel 1.52.0
-%global bootstrap_date 2021-05-06
+%global bootstrap_rust 1.53.0
+%global bootstrap_cargo 1.53.0
+%global bootstrap_channel 1.53.0
+%global bootstrap_date 2021-06-17

 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@ -61,7 +61,7 @@
 %endif

 Name:           rust
-Version:        1.53.0
+Version:        1.54.0
 Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
@ -623,6 +623,9 @@ for triple in %{cross_targets}; do
 done
 %endif

+# These are transient files used by x.py dist and install
+rm -rf ./build/dist/ ./build/tmp/
+
 # Make sure the shared libraries are in the proper libdir
 %if "%{_libdir}" != "%{common_libdir}"
 mkdir -p %{buildroot}%{_libdir}
@ -694,8 +697,13 @@ rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*
 export %{rust_env}

 # The results are not stable on koji, so mask errors and just log it.
+# Some of the larger test artifacts are manually cleaned to save space.
 %{python} ./x.py test --no-fail-fast --stage 2 || :
+rm -rf "./build/%{rust_triple}/test/"
+
 %{python} ./x.py test --no-fail-fast --stage 2 cargo || :
+rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/"
+
 %{python} ./x.py test --no-fail-fast --stage 2 clippy || :
 %{python} ./x.py test --no-fail-fast --stage 2 rls || :
 %{python} ./x.py test --no-fail-fast --stage 2 rustfmt || :
@ -828,6 +836,9 @@ end}


 %changelog
+* Wed Aug 04 2021 Josh Stone <jistone@redhat.com> - 1.54.0-1
+- Update to 1.54.0.
+
 * Tue Jun 22 2021 Josh Stone <jistone@redhat.com> - 1.53.0-1
 - Update to 1.53.0.
 - Update openssl crates to published versions for 3.0 support.
--- a/2
+++ b/2
@ -1,3 +1,3 @@
-SHA512 (rustc-1.53.0-src.tar.xz) = 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
+SHA512 (rustc-1.54.0-src.tar.xz) = 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
 SHA512 (openssl-0.10.35.crate) = 5ebe4626a894ccc6e5c159cef72357654aa1a20dcc863fdab495f10a574b49b0b9d4e85a069b8b9297544ea0d09fd88a976396c3a8e8faaee9d01d79d943126f
 SHA512 (openssl-sys-0.9.65.crate) = 4c14ff5258a35b86e35d352c5702c90e1f70954c8f33d17160694b63305057b97da3ac6846d3e8f8e7293c40f15b76effd1e34fad4be613b8d815b90148406f7
--- a/12
+++ b/12
@ -1,8 +1,8 @@
-SHA512 (rustc-1.53.0-src.tar.xz) = 70485cf7a0f7fc36ee31644e546374079dc387a85b44e5e793707fd0a4d7ca05d311291e78b86db955485d8f21c47ff9e1908acc4da68ba04929287213a40c24
-SHA512 (rust-1.52.0-aarch64-unknown-linux-gnu.tar.xz) = 7a26e14be6b27c7084c7c85b312341ab991c2df91ea53128f14707a4c725dd03ba7df30b9e9fcef39a509ab4f5d5feb028b99d6d9ffcc059996ed29b83eb90b9
-SHA512 (rust-1.52.0-i686-unknown-linux-gnu.tar.xz) = 10fcf9e891ae8bc6e83b5e71c83b34773c18b024c9e9b580cfae714b4e135d313ba5434fc28c2dffa3db2e50669b3acd07e6874de0cfab89b343db92bfbdff80
-SHA512 (rust-1.52.0-powerpc64le-unknown-linux-gnu.tar.xz) = 916a3338c850cf804535e25aebc0fdcf6cea8fe9e5df9fed11fbf03ae81fb8220321dc41edd7133f287dfee0dbf19730ff8b020f32322850329865db76bab95e
-SHA512 (rust-1.52.0-s390x-unknown-linux-gnu.tar.xz) = 6a91adf7c1947b63db0bf02b4aa4a36fbbfcc5b40d9c18175e4c5efe785b8a17ff21a887476cf76f7e3d3854f2cc362b5d2dc8243493291a4d19a705276e6355
-SHA512 (rust-1.52.0-x86_64-unknown-linux-gnu.tar.xz) = 27a8db421ae62af92e2c34dcc1fdd617bf7e8de2c68205773a3037be496ccbf21f5549dd18377a9730102e7915519824231218fef9a09abe9d116441d6ce28d2
+SHA512 (rustc-1.54.0-src.tar.xz) = 5162f85b43ca2c5af93fdbfb2597d75df8a838f7fcc025a5298499ce1043db50f1ea2fbba753e47ce5daad3d80d4b612acf6527ef902c34117763e687fdbbcfa
+SHA512 (rust-1.53.0-aarch64-unknown-linux-gnu.tar.xz) = aed515e60e5eb22478b864f7e9aa74b99b9843afe6d1fcc9d0ad78bfd48a39b0d9c8ee7b785f273c3bf5d3a173c169fd6dcd5c64fa67c49285803ff4598d9f59
+SHA512 (rust-1.53.0-i686-unknown-linux-gnu.tar.xz) = 404969329b88ce3f3078837e7bd33de28babf0834e366f5663abab79bf810f2c0ddfeea304bb6289415862afc50289d897cb92fc3f0c0ee8a40bcfc8c23b567c
+SHA512 (rust-1.53.0-powerpc64le-unknown-linux-gnu.tar.xz) = f418272864889635494553cd1f6216b0487c016c31603532920e45435da85154f6ec275bee6d2a32ef6755fb12f57151ce2d3c7c5d6d97c2eb3d81f7c2842c48
+SHA512 (rust-1.53.0-s390x-unknown-linux-gnu.tar.xz) = ca142b436b1396ad978ba1d1a0993a4bba105d9e99bf89a9aea731b7406399a2132a531664fa6fec17af20f99ebd5c0a7ad329d2b143565fb878f4e7290aeb4c
+SHA512 (rust-1.53.0-x86_64-unknown-linux-gnu.tar.xz) = 3b1ee4a549917fc514de7dfb99392cfa058cb06fb93266e4864d4df3ff86372eeef9a9d2a459f93462eaab8f223d3eaff1e824d42be7b983c44d18ec1579c6fa
 SHA512 (openssl-0.10.35.crate) = 5ebe4626a894ccc6e5c159cef72357654aa1a20dcc863fdab495f10a574b49b0b9d4e85a069b8b9297544ea0d09fd88a976396c3a8e8faaee9d01d79d943126f
 SHA512 (openssl-sys-0.9.65.crate) = 4c14ff5258a35b86e35d352c5702c90e1f70954c8f33d17160694b63305057b97da3ac6846d3e8f8e7293c40f15b76effd1e34fad4be613b8d815b90148406f7