beta test

0001-Use-lld-provided-by-system-for-wasm.patch

@@ -1,17 +1,17 @@
-From 1a6307bbf7972aa2ce89a213bad6f26b6325a59c Mon Sep 17 00:00:00 2001
+From 3582a262d27fd5a2f8705bad6018241eaca8aadd 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
 
 ---
- compiler/rustc_target/src/spec/wasm32_base.rs | 3 +--
+ compiler/rustc_target/src/spec/wasm_base.rs | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/compiler/rustc_target/src/spec/wasm32_base.rs b/compiler/rustc_target/src/spec/wasm32_base.rs
-index bfef3d37228f..0ecb29248fe2 100644
---- a/compiler/rustc_target/src/spec/wasm32_base.rs
-+++ b/compiler/rustc_target/src/spec/wasm32_base.rs
-@@ -97,8 +97,7 @@ pub fn options() -> TargetOptions {
+diff --git a/compiler/rustc_target/src/spec/wasm_base.rs b/compiler/rustc_target/src/spec/wasm_base.rs
+index b208eb92f8ff..94a701a11c8b 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 {
          // arguments just yet
          limit_rdylib_exports: false,
  

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.51.0
-%global bootstrap_cargo 1.51.0
-%global bootstrap_channel 1.51.0
-%global bootstrap_date 2021-03-25
+%global bootstrap_rust 1.52.0
+%global bootstrap_cargo 1.52.0
+%global bootstrap_channel 1.52.0
+%global bootstrap_date 2021-05-06
 
 # Only the specified arches will use bootstrap binaries.
 #global bootstrap_arches %%{rust_arches}
@@ -30,7 +30,7 @@
 %bcond_with llvm_static
 
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
-# is insufficient.  Rust currently requires LLVM 9.0+.
+# is insufficient.  Rust currently requires LLVM 10.0+.
 %bcond_with bundled_llvm
 
 # Requires stable libgit2 1.1
@@ -61,8 +61,8 @@
 %endif
 
 Name:           rust
-Version:        1.52.1
-Release:        2%{?dist}
+Version:        1.53.0~beta.3
+Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
@@ -90,7 +90,7 @@ Patch100:       rustc-1.48.0-disable-libssh2.patch
 
 # libcurl on RHEL7 doesn't have http2, but since cargo requests it, curl-sys
 # will try to build it statically -- instead we turn off the feature.
-Patch101:       rustc-1.51.0-disable-http2.patch
+Patch101:       rustc-1.53.0-disable-http2.patch
 
 # kernel rh1410097 causes too-small stacks for PIE.
 # (affects RHEL6 kernels when building for RHEL7)
@@ -181,7 +181,7 @@ Provides:       bundled(llvm) = 12.0.0
 %else
 BuildRequires:  cmake >= 2.8.11
 %if 0%{?epel} == 7
-%global llvm llvm9.0
+%global llvm llvm11.0
 %endif
 %if 0%{?fedora} == 34
 # aarch64 is hanging with LLVM 12-rc1, but it's fine with 12-final on rawhide.
@@ -194,7 +194,7 @@ BuildRequires:  cmake >= 2.8.11
 %global llvm llvm
 %global llvm_root %{_prefix}
 %endif
-BuildRequires:  %{llvm}-devel >= 9.0
+BuildRequires:  %{llvm}-devel >= 10.0
 %if %with llvm_static
 BuildRequires:  %{llvm}-static
 BuildRequires:  libffi-devel
@@ -809,6 +809,9 @@ end}
 
 
 %changelog
+* Fri Jun 04 2021 Josh Stone <jistone@redhat.com> - 1.53.0~beta.3-1
+- beta test
+
 * Wed Jun 02 2021 Josh Stone <jistone@redhat.com> - 1.52.1-2
 - Set rust.codegen-units-std=1 for all targets again.
 - Add rust-std-static-wasm32-unknown-unknown.

rustc-1.53.0-disable-http2.patch

@@ -1,6 +1,6 @@
---- rustc-beta-src/Cargo.lock.orig	2021-03-09 10:30:08.626424998 -0800
-+++ rustc-beta-src/Cargo.lock	2021-03-09 10:32:38.096207704 -0800
-@@ -899,7 +899,6 @@
+--- rustc-beta-src/Cargo.lock.orig	2021-06-04 15:56:04.141227630 -0700
++++ rustc-beta-src/Cargo.lock	2021-06-04 16:03:04.461396826 -0700
+@@ -885,7 +885,6 @@
  dependencies = [
   "cc",
   "libc",
@@ -8,8 +8,8 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -1860,16 +1859,6 @@
- ]
+@@ -1904,16 +1903,6 @@
+ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
  
  [[package]]
 -name = "libnghttp2-sys"
@@ -25,20 +25,20 @@
  name = "libz-sys"
  version = "1.1.2"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2021-03-05 08:34:15.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2021-03-09 10:32:38.096207704 -0800
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2021-06-04 15:56:04.143227587 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2021-06-04 15:57:56.931857927 -0700
 @@ -25,7 +25,7 @@
+ cargo-util = { path = "crates/cargo-util", version = "0.1.0" }
  crates-io = { path = "crates/crates-io", version = "0.33.0" }
  crossbeam-utils = "0.8"
- crypto-hash = "0.3.1"
 -curl = { version = "0.4.23", features = ["http2"] }
 +curl = { version = "0.4.23", features = [] }
  curl-sys = "0.4.22"
  env_logger = "0.8.1"
  pretty_env_logger = { version = "0.4", optional = true }
---- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2021-03-05 08:34:15.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2021-03-09 10:32:38.096207704 -0800
-@@ -412,14 +412,8 @@
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2021-05-22 15:22:31.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2021-06-04 16:00:03.903190293 -0700
+@@ -416,14 +416,8 @@
          // Also note that pipelining is disabled as curl authors have indicated
          // that it's buggy, and we've empirically seen that it's buggy with HTTP
          // proxies.
@@ -46,7 +46,7 @@
 -        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
 -        multi
 -            .pipelining(false, multiplexing)
--            .chain_err(|| "failed to enable multiplexing/pipelining in curl")?;
+-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
 -
 -        // let's not flood crates.io with connections
 -        multi.set_max_host_connections(2)?;
@@ -55,7 +55,7 @@
  
          Ok(PackageSet {
              packages: package_ids
-@@ -592,7 +586,7 @@
+@@ -596,7 +590,7 @@
  macro_rules! try_old_curl {
      ($e:expr, $msg:expr) => {
          let result = $e;