import rust-1.61.0-1.module+el8.7.0+15547+d9379ca5

2022-09-01 05:35:10 +00:00 · 2022-09-01 05:35:10 +00:00 · 989522387e
commit 989522387e
parent ca405825b2
11 changed files with 320 additions and 155 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/rustc-1.59.0-src.tar.xz
-SOURCES/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz
+SOURCES/rustc-1.61.0-src.tar.xz
+SOURCES/wasi-libc-9886d3d6200fcc3726329966860fc058707406cd.tar.gz
--- a/.rust.metadata
+++ b/.rust.metadata
@ -1,2 +1,2 @@
-6b4d78a09afcba3ece6f4f535360cf889eba00a2 SOURCES/rustc-1.59.0-src.tar.xz
-b8865d1192852214d6d9b0a0957d4b36c16832aa SOURCES/wasi-libc-ad5133410f66b93a2381db5b542aad5e0964db96.tar.gz
+c4672825b751f22647b610583ea75b8cd4d55ec3 SOURCES/rustc-1.61.0-src.tar.xz
+22625595caa645e86282b79b5564abb40250d244 SOURCES/wasi-libc-9886d3d6200fcc3726329966860fc058707406cd.tar.gz
--- a/SOURCES/0001-Add-missing-target_feature-to-the-list-of-well-known.patch
+++ b/SOURCES/0001-Add-missing-target_feature-to-the-list-of-well-known.patch
@ -0,0 +1,36 @@
+From beb4e16f055aa7925194fd2c360105a6d55f10f6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Lo=C3=AFc=20BRANSTETT?= <lolo.branstett@numericable.fr>
+Date: Wed, 27 Apr 2022 19:11:56 +0200
+Subject: [PATCH] Add missing `target_feature` to the list of well known cfg
+ names
+
+---
+ compiler/rustc_session/src/config.rs | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
+index 12c5c4445d46..330201dd8fef 100644
+--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
+@@ -1038,6 +1038,7 @@ fn fill_well_known_names(&mut self) {
+             sym::target_has_atomic_load_store,
+             sym::target_has_atomic,
+             sym::target_has_atomic_equal_alignment,
+            sym::target_feature,
+             sym::panic,
+             sym::sanitize,
+             sym::debug_assertions,
+@@ -1081,6 +1082,10 @@ fn fill_well_known_values(&mut self) {
+             .into_iter()
+             .map(|sanitizer| Symbol::intern(sanitizer.as_str().unwrap()));
+ 
+        // Unknown possible values:
+        //  - `feature`
+        //  - `target_feature`
+
+         // No-values
+         for name in [
+             sym::doc,
+-- 
+2.36.1
+
--- a/SOURCES/0001-Use-lld-provided-by-system-for-wasm.patch
+++ b/SOURCES/0001-Use-lld-provided-by-system-for-wasm.patch
@ -1,4 +1,4 @@
-From 9ac837c237568a6c1c5f0e979fcce208cd9c926a Mon Sep 17 00:00:00 2001
+From b521511174b1a08dddfac243604d649b71cc7386 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,7 +8,7 @@ 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 4c954a1e567c..15c4f1bda5eb 100644
+index de7b7374af31..eebbe616e9b6 100644
 --- a/compiler/rustc_target/src/spec/wasm_base.rs
 +++ b/compiler/rustc_target/src/spec/wasm_base.rs
@@ -99,8 +99,7 @@ pub fn options() -> TargetOptions {
@ -16,11 +16,11 @@ index 4c954a1e567c..15c4f1bda5eb 100644
         limit_rdylib_exports: false,
 
 -        // we use the LLD shipped with the Rust toolchain by default
-        linker: Some("rust-lld".to_owned()),
-+        linker: Some("lld".to_owned()),
+-        linker: Some("rust-lld".into()),
+        linker: Some("lld".into()),
         lld_flavor: LldFlavor::Wasm,
         linker_is_gnu: false,
 
 -- 
-2.31.1
+2.35.1

--- a/SOURCES/macros.rust-toolset
+++ b/SOURCES/macros.rust-toolset
@ -0,0 +1,51 @@
+# Explicitly use bindir tools, in case others are in the PATH,
+# like the rustup shims in a user's ~/.cargo/bin/.
+#
+# Since cargo 1.31, install only uses $CARGO_HOME/config, ignoring $PWD.
+#   https://github.com/rust-lang/cargo/issues/6397
+# But we can set CARGO_HOME locally, which is a good idea anyway to make sure
+# it never writes to ~/.cargo during rpmbuild.
+%__cargo %{_bindir}/env CARGO_HOME=.cargo %{_bindir}/cargo
+%__rustc %{_bindir}/rustc
+%__rustdoc %{_bindir}/rustdoc
+
+# Enable optimization, debuginfo, and link hardening.
+%__global_rustflags -Copt-level=3 -Cdebuginfo=2 -Clink-arg=-Wl,-z,relro,-z,now
+
+%__global_rustflags_toml [%{lua:
+    for arg in string.gmatch(rpm.expand("%{__global_rustflags}"), "%S+") do
+        print('"' .. arg .. '", ')
+    end}]
+
+%cargo_prep(V:) (\
+%{__mkdir} -p .cargo \
+cat > .cargo/config << EOF \
+[build]\
+rustc = "%{__rustc}"\
+rustdoc = "%{__rustdoc}"\
+rustflags = %{__global_rustflags_toml}\
+\
+[install]\
+root = "%{buildroot}%{_prefix}"\
+\
+[term]\
+verbose = true\
+EOF\
+%if 0%{-V:1}\
+%{__tar} -xoaf %{S:%{-V*}}\
+cat >> .cargo/config << EOF \
+\
+[source.crates-io]\
+replace-with = "vendored-sources"\
+\
+[source.vendored-sources]\
+directory = "./vendor"\
+EOF\
+%endif\
+)
+
+%cargo_build %__cargo build --release %{?_smp_mflags}
+
+%cargo_test %__cargo test --release %{?_smp_mflags} --no-fail-fast
+
+%cargo_install %__cargo install --no-track --path .
--- a/SOURCES/rust-pr94505-mono-item-sort-local.patch
+++ b/SOURCES/rust-pr94505-mono-item-sort-local.patch
@ -1,34 +0,0 @@
-diff --git a/compiler/rustc_middle/src/mir/mono.rs b/compiler/rustc_middle/src/mir/mono.rs
-index 892808386dee..13c325a14e40 100644
--- a/compiler/rustc_middle/src/mir/mono.rs
-+++ b/compiler/rustc_middle/src/mir/mono.rs
-@@ -7,6 +7,7 @@
- use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
- use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
- use rustc_hir::ItemId;
-+use rustc_index::vec::Idx;
- use rustc_query_system::ich::{NodeIdHashingMode, StableHashingContext};
- use rustc_session::config::OptLevel;
- use rustc_span::source_map::Span;
-@@ -380,7 +381,7 @@ fn item_sort_key<'tcx>(tcx: TyCtxt<'tcx>, item: MonoItem<'tcx>) -> ItemSortKey<'
-                             // instances into account. The others don't matter for
-                             // the codegen tests and can even make item order
-                             // unstable.
-                            InstanceDef::Item(def) => Some(def.did.index.as_usize()),
-+                            InstanceDef::Item(def) => def.did.as_local().map(Idx::index),
-                             InstanceDef::VtableShim(..)
-                             | InstanceDef::ReifyShim(..)
-                             | InstanceDef::Intrinsic(..)
-@@ -391,10 +392,8 @@ fn item_sort_key<'tcx>(tcx: TyCtxt<'tcx>, item: MonoItem<'tcx>) -> ItemSortKey<'
-                             | InstanceDef::CloneShim(..) => None,
-                         }
-                     }
-                    MonoItem::Static(def_id) => Some(def_id.index.as_usize()),
-                    MonoItem::GlobalAsm(item_id) => {
-                        Some(item_id.def_id.to_def_id().index.as_usize())
-                    }
-+                    MonoItem::Static(def_id) => def_id.as_local().map(Idx::index),
-+                    MonoItem::GlobalAsm(item_id) => Some(item_id.def_id.index()),
-                 },
-                 item.symbol_name(tcx),
-             )
--- a/SOURCES/rustc-1.59.0-disable-http2.patch
+++ b/SOURCES/rustc-1.59.0-disable-http2.patch
@ -1,66 +0,0 @@
--- rustc-1.59.0-src/Cargo.lock.orig	2022-02-22 10:19:00.330367749 -0800
-+++ rustc-1.59.0-src/Cargo.lock	2022-02-22 10:19:00.332367706 -0800
-@@ -909,7 +909,6 @@
- dependencies = [
-  "cc",
-  "libc",
- "libnghttp2-sys",
-  "libz-sys",
-  "openssl-sys",
-  "pkg-config",
-@@ -1957,16 +1956,6 @@
- checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
- 
- [[package]]
-name = "libnghttp2-sys"
-version = "0.1.4+1.41.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
- name = "libz-sys"
- version = "1.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--- rustc-1.59.0-src/src/tools/cargo/Cargo.toml.orig	2022-02-22 10:19:00.332367706 -0800
-+++ rustc-1.59.0-src/src/tools/cargo/Cargo.toml	2022-02-22 10:19:54.029231795 -0800
-@@ -22,7 +22,7 @@
- cargo-util = { path = "crates/cargo-util", version = "0.1.2" }
- crates-io = { path = "crates/crates-io", version = "0.33.1" }
- crossbeam-utils = "0.8"
-curl = { version = "0.4.41", features = ["http2"] }
-+curl = { version = "0.4.41", features = [] }
- curl-sys = "0.4.50"
- env_logger = "0.9.0"
- pretty_env_logger = { version = "0.4", optional = true }
--- rustc-1.59.0-src/src/tools/cargo/src/cargo/core/package.rs.orig	2022-02-21 18:48:53.000000000 -0800
-+++ rustc-1.59.0-src/src/tools/cargo/src/cargo/core/package.rs	2022-02-22 10:19:00.332367706 -0800
-@@ -419,14 +419,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.
-        let mut multi = Multi::new();
-        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
-        multi
-            .pipelining(false, multiplexing)
-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
-
-        // let's not flood crates.io with connections
-        multi.set_max_host_connections(2)?;
-+        let multi = Multi::new();
-+        let multiplexing = false;
- 
-         Ok(PackageSet {
-             packages: package_ids
-@@ -655,7 +649,7 @@
- macro_rules! try_old_curl {
-     ($e:expr, $msg:expr) => {
-         let result = $e;
-        if cfg!(target_os = "macos") {
-+        if cfg!(any(target_os = "linux", target_os = "macos")) {
-             if let Err(e) = result {
-                 warn!("ignoring libcurl {} error: {}", $msg, e);
-             }
--- a/SOURCES/rustc-1.61.0-disable-http2.patch
+++ b/SOURCES/rustc-1.61.0-disable-http2.patch
@ -0,0 +1,90 @@
+--- rustc-beta-src/Cargo.lock.orig	2022-04-28 15:34:11.668960640 -0700
+++ rustc-beta-src/Cargo.lock	2022-04-28 15:35:24.542419588 -0700
+@@ -951,7 +951,6 @@
+ dependencies = [
+  "cc",
+  "libc",
+- "libnghttp2-sys",
+  "libz-sys",
+  "openssl-sys",
+  "pkg-config",
+@@ -2002,16 +2001,6 @@
+ checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
+ 
+ [[package]]
+-name = "libnghttp2-sys"
+-version = "0.1.4+1.41.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "03624ec6df166e79e139a2310ca213283d6b3c30810c54844f307086d4488df1"
+-dependencies = [
+- "cc",
+- "libc",
+-]
+-
+-[[package]]
+ name = "libz-sys"
+ version = "1.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2022-04-24 17:43:07.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2022-04-28 15:34:11.670960598 -0700
+@@ -22,7 +22,7 @@
+ cargo-util = { path = "crates/cargo-util", version = "0.1.2" }
+ crates-io = { path = "crates/crates-io", version = "0.34.0" }
+ crossbeam-utils = "0.8"
+-curl = { version = "0.4.41", features = ["http2"] }
+curl = { version = "0.4.41", features = [] }
+ curl-sys = "0.4.50"
+ env_logger = "0.9.0"
+ pretty_env_logger = { version = "0.4", optional = true }
+--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2022-04-24 17:43:07.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2022-04-28 15:34:11.670960598 -0700
+@@ -183,16 +183,8 @@
+         }
+         self.fetch_started = true;
+ 
+-        // We've enabled the `http2` feature of `curl` in Cargo, so treat
+-        // failures here as fatal as it would indicate a build-time problem.
+-        self.multiplexing = self.config.http_config()?.multiplexing.unwrap_or(true);
+-
+-        self.multi
+-            .pipelining(false, self.multiplexing)
+-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
+-
+-        // let's not flood the server with connections
+-        self.multi.set_max_host_connections(2)?;
+        // Multiplexing is disabled because the system libcurl doesn't support it.
+        self.multiplexing = false;
+ 
+         self.config
+             .shell()
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2022-04-24 17:43:07.000000000 -0700
+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2022-04-28 15:34:11.670960598 -0700
+@@ -403,16 +403,9 @@
+         sources: SourceMap<'cfg>,
+         config: &'cfg Config,
+     ) -> CargoResult<PackageSet<'cfg>> {
+-        // We've enabled the `http2` feature of `curl` in Cargo, so treat
+-        // failures here as fatal as it would indicate a build-time problem.
+-        let mut multi = Multi::new();
+-        let multiplexing = config.http_config()?.multiplexing.unwrap_or(true);
+-        multi
+-            .pipelining(false, multiplexing)
+-            .with_context(|| "failed to enable multiplexing/pipelining in curl")?;
+-
+-        // let's not flood crates.io with connections
+-        multi.set_max_host_connections(2)?;
+        // Multiplexing is disabled because the system libcurl doesn't support it.
+        let multi = Multi::new();
+        let multiplexing = false;
+ 
+         Ok(PackageSet {
+             packages: package_ids
+@@ -658,7 +651,7 @@
+ macro_rules! try_old_curl {
+     ($e:expr, $msg:expr) => {
+         let result = $e;
+-        if cfg!(target_os = "macos") {
+        if cfg!(any(target_os = "linux", target_os = "macos")) {
+             if let Err(e) = result {
+                 warn!("ignoring libcurl {} error: {}", $msg, e);
+             }
--- a/SOURCES/rustc-1.61.0-fix-compiletest-ignore_message.patch
+++ b/SOURCES/rustc-1.61.0-fix-compiletest-ignore_message.patch
@ -0,0 +1,13 @@
+diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs
+index 1bdea33dffaf..1c21d5e87b68 100644
+--- a/src/tools/compiletest/src/header.rs
+++ b/src/tools/compiletest/src/header.rs
+@@ -807,7 +807,7 @@ pub fn make_test_description<R: Read>(
+ ) -> test::TestDesc {
+     let mut ignore = false;
+     #[cfg(not(bootstrap))]
+-    let ignore_message: Option<String> = None;
+    let ignore_message = None;
+     let mut should_fail = false;
+ 
+     let rustc_has_profiler_support = env::var_os("RUSTC_PROFILER_SUPPORT").is_some();
--- a/SOURCES/rustc-1.61.0-rust-gdb-substitute-path.patch
+++ b/SOURCES/rustc-1.61.0-rust-gdb-substitute-path.patch
@ -0,0 +1,18 @@
+--- rustc-1.61.0-src/src/etc/rust-gdb.orig	2022-05-17 18:29:36.000000000 -0700
+++ rustc-1.61.0-src/src/etc/rust-gdb	2022-05-18 11:18:13.732709661 -0700
+@@ -14,6 +14,9 @@ fi
+ RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+ GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+ 
+RUST_STD_BUILD="@BUILDDIR@/library/"
+RUST_STD_SRC="$RUSTC_SYSROOT/lib/rustlib/src/rust/library/"
+
+ # Run GDB with the additional arguments that load the pretty printers
+ # Set the environment variable `RUST_GDB` to overwrite the call to a
+ # different/specific command (defaults to `gdb`).
+@@ -21,4 +24,5 @@ RUST_GDB="${RUST_GDB:-gdb}"
+ PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
+   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
+   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
+  -iex "set substitute-path $RUST_STD_BUILD $RUST_STD_SRC" \
+   "$@"
--- a/SPECS/rust.spec
+++ b/SPECS/rust.spec
@ -6,15 +6,17 @@
 %{!?channel: %global channel stable}

 # To bootstrap from scratch, set the channel and date from src/stage0.json
-# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
+# e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13
 # or nightly wants some beta-YYYY-MM-DD
-# Note that cargo matches the program version here, not its crate version.
-%global bootstrap_rust 1.58.0
-%global bootstrap_cargo 1.58.0
-%global bootstrap_channel 1.58.0
-%global bootstrap_date 2022-01-13
+%global bootstrap_version 1.60.0
+%global bootstrap_channel 1.60.0
+%global bootstrap_date 2022-04-07

 # Only the specified arches will use bootstrap binaries.
+# NOTE: Those binaries used to be uploaded with every new release, but that was
+# a waste of lookaside cache space when they're most often unused.
+# Run "spectool -g rust.spec" after changing this and then "fedpkg upload" to
+# add them to sources. Remember to remove them again after the bootstrap build!
 #global bootstrap_arches %%{rust_arches}

 # Define a space-separated list of targets to ship rust-std-static-$triple for
@ -35,8 +37,9 @@

 # We need CRT files for *-wasi targets, at least as new as the commit in
 # src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh
+# (updated per https://github.com/rust-lang/rust/pull/96907)
 %global wasi_libc_url https://github.com/WebAssembly/wasi-libc
-%global wasi_libc_commit ad5133410f66b93a2381db5b542aad5e0964db96
+%global wasi_libc_commit 9886d3d6200fcc3726329966860fc058707406cd
 %global wasi_libc_name wasi-libc-%{wasi_libc_commit}
 %global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_commit}/%{wasi_libc_name}.tar.gz
 %global wasi_libc_dir %{_builddir}/%{wasi_libc_name}
@ -47,15 +50,15 @@
 # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
 # is insufficient.  Rust currently requires LLVM 12.0+.
 %global min_llvm_version 12.0.0
-%global bundled_llvm_version 13.0.0
+%global bundled_llvm_version 14.0.0
 %bcond_with bundled_llvm

-# Requires stable libgit2 1.3, and not the next minor soname change.
+# Requires stable libgit2 1.4, and not the next minor soname change.
 # This needs to be consistent with the bindings in vendor/libgit2-sys.
-%global min_libgit2_version 1.3.0
-%global next_libgit2_version 1.4.0~
-%global bundled_libgit2_version 1.3.0
-%if 0%{?fedora} >= 36
+%global min_libgit2_version 1.4.0
+%global next_libgit2_version 1.5.0~
+%global bundled_libgit2_version 1.4.2
+%if 0%{?fedora} >= 99
 %bcond_with bundled_libgit2
 %else
 %bcond_without bundled_libgit2
@ -84,7 +87,7 @@
 %endif

 Name:           rust
-Version:        1.59.0
+Version:        1.61.0
 Release:        1%{?dist}
 Summary:        The Rust Programming Language
 License:        (ASL 2.0 or MIT) and (BSD and MIT)
@ -104,18 +107,27 @@ Source1:        %{wasi_libc_source}
 # By default, rust tries to use "rust-lld" as a linker for WebAssembly.
 Patch1:         0001-Use-lld-provided-by-system-for-wasm.patch

-# This regressed in 1.59, hanging builds on s390x, rhbz#2058803
-# https://github.com/rust-lang/rust/pull/94505
-Patch2:         rust-pr94505-mono-item-sort-local.patch
+# Set a substitute-path in rust-gdb for standard library sources.
+Patch2:         rustc-1.61.0-rust-gdb-substitute-path.patch
+
+# Infer the type that compiletest uses for TestDesc ignore_message
+Patch3:         rustc-1.61.0-fix-compiletest-ignore_message.patch
+
+# Add missing target_feature to the list of well known cfg names
+# https://github.com/rust-lang/rust/pull/96483
+Patch4:         0001-Add-missing-target_feature-to-the-list-of-well-known.patch

 ### RHEL-specific patches below ###

+# Simple rpm macros for rust-toolset (as opposed to full rust-packaging)
+Source100:      macros.rust-toolset
+
 # Disable cargo->libgit2->libssh2 on RHEL, as it's not approved for FIPS (rhbz1732949)
 Patch100:       rustc-1.59.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.59.0-disable-http2.patch
+Patch101:       rustc-1.61.0-disable-http2.patch

 # kernel rh1410097 causes too-small stacks for PIE.
 # (affects RHEL6 kernels when building for RHEL7)
@ -148,31 +160,35 @@ end}
  for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do
    table.insert(bootstrap_arches, arch)
  end
-  local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}"
-                          .."/rust-%{bootstrap_channel}")
+  local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}")
+  local channel = rpm.expand("%{bootstrap_channel}")
  local target_arch = rpm.expand("%{_target_cpu}")
  for i, arch in ipairs(bootstrap_arches) do
-    i = 100 + i
-    print(string.format("Source%d: %s-%s.tar.xz\n",
-                        i, base, rust_triple(arch)))
+    i = 1000 + i * 3
+    local suffix = channel.."-"..rust_triple(arch)
+    print(string.format("Source%d: %s/cargo-%s.tar.xz\n", i, base, suffix))
+    print(string.format("Source%d: %s/rustc-%s.tar.xz\n", i+1, base, suffix))
+    print(string.format("Source%d: %s/rust-std-%s.tar.xz\n", i+2, base, suffix))
    if arch == target_arch then
-      rpm.define("bootstrap_source "..i)
+      rpm.define("bootstrap_source_cargo "..i)
+      rpm.define("bootstrap_source_rustc "..i+1)
+      rpm.define("bootstrap_source_std "..i+2)
+      rpm.define("bootstrap_suffix "..suffix)
    end
  end
 end}
 %endif

 %ifarch %{bootstrap_arches}
-%global bootstrap_root rust-%{bootstrap_channel}-%{rust_triple}
-%global local_rust_root %{_builddir}/%{bootstrap_root}/usr
-Provides:       bundled(%{name}-bootstrap) = %{bootstrap_rust}
+%global local_rust_root %{_builddir}/rust-%{bootstrap_suffix}
+Provides:       bundled(%{name}-bootstrap) = %{bootstrap_version}
 %else
-BuildRequires:  cargo >= %{bootstrap_cargo}
+BuildRequires:  cargo >= %{bootstrap_version}
 %if 0%{?rhel} && 0%{?rhel} < 8
-BuildRequires:  %{name} >= %{bootstrap_rust}
+BuildRequires:  %{name} >= %{bootstrap_version}
 BuildConflicts: %{name} > %{version}
 %else
-BuildRequires:  (%{name} >= %{bootstrap_rust} with %{name} <= %{version})
+BuildRequires:  (%{name} >= %{bootstrap_version} with %{name} <= %{version})
 %endif
 %global local_rust_root %{_prefix}
 %endif
@ -531,12 +547,30 @@ feature for the Rust standard library. The RLS (Rust Language Server) uses this
 data to provide information about the Rust standard library.


+%if 0%{?rhel} && 0%{?rhel} >= 8
+
+%package toolset
+Summary:        Rust Toolset
+Requires:       rust%{?_isa} = %{version}-%{release}
+Requires:       cargo%{?_isa} = %{version}-%{release}
+
+%description toolset
+This is the metapackage for Rust Toolset, bringing in the Rust compiler,
+the Cargo package manager, and a few convenience macros for rpm builds.
+
+%endif
+
+
 %prep

 %ifarch %{bootstrap_arches}
-%setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
-./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
-  --prefix=%{local_rust_root} --disable-ldconfig
+rm -rf %{local_rust_root}
+%setup -q -n cargo-%{bootstrap_suffix} -T -b %{bootstrap_source_cargo}
+./install.sh --prefix=%{local_rust_root} --disable-ldconfig
+%setup -q -n rustc-%{bootstrap_suffix} -T -b %{bootstrap_source_rustc}
+./install.sh --prefix=%{local_rust_root} --disable-ldconfig
+%setup -q -n rust-std-%{bootstrap_suffix} -T -b %{bootstrap_source_std}
+./install.sh --prefix=%{local_rust_root} --disable-ldconfig
 test -f '%{local_rust_root}/bin/cargo'
 test -f '%{local_rust_root}/bin/rustc'
 %endif
@ -549,6 +583,8 @@ test -f '%{local_rust_root}/bin/rustc'

 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1

 %if %with disabled_libssh2
 %patch100 -p1
@ -566,6 +602,9 @@ rm -rf vendor/libnghttp2-sys/
 # Use our explicit python3 first
 sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure

+# Set a substitute-path in rust-gdb for standard library sources.
+sed -i.rust-src -e "s#@BUILDDIR@#$PWD#" ./src/etc/rust-gdb
+
 %if %without bundled_llvm
 rm -rf src/llvm-project/
 mkdir -p src/llvm-project/libunwind/
@ -573,7 +612,8 @@ mkdir -p src/llvm-project/libunwind/

 # Remove other unused vendored libraries
 rm -rf vendor/curl-sys/curl/
-rm -rf vendor/jemalloc-sys/jemalloc/
+rm -rf vendor/*jemalloc-sys*/jemalloc/
+rm -rf vendor/libmimalloc-sys/c_src/mimalloc/
 rm -rf vendor/libssh2-sys/libssh2/
 rm -rf vendor/libz-sys/src/zlib/
 rm -rf vendor/libz-sys/src/zlib-ng/
@ -651,14 +691,6 @@ if [ "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ]; then
  ncpus="$max_cpus"
 fi

-%define target_config %{shrink:
-  --set target.%{rust_triple}.linker=%{__cc}
-  --set target.%{rust_triple}.cc=%{__cc}
-  --set target.%{rust_triple}.cxx=%{__cxx}
-  --set target.%{rust_triple}.ar=%{__ar}
-  --set target.%{rust_triple}.ranlib=%{__ranlib}
-}
-
 %if %defined mingw_targets
 %{lua: do
  local cfg = ""
@ -667,20 +699,21 @@ fi
      triple = triple,
      mingw = string.sub(triple, 1, 4) == "i686" and "mingw32" or "mingw64",
    }
-    local s = string.gsub([[%{shrink:
+    local s = string.gsub([[
      --set target.{{triple}}.linker=%{{{mingw}}_cc}
      --set target.{{triple}}.cc=%{{{mingw}}_cc}
      --set target.{{triple}}.ar=%{{{mingw}}_ar}
      --set target.{{triple}}.ranlib=%{{{mingw}}_ranlib}
-    }]], "{{(%w+)}}", subs)
+    ]], "{{(%w+)}}", subs)
    cfg = cfg .. " " .. s
  end
+  cfg = string.gsub(cfg, "%s+", " ")
  rpm.define("mingw_target_config " .. cfg)
 end}
 %endif

 %if %defined wasm_targets
-%make_build --quiet -C %{wasi_libc_dir}
+%make_build --quiet -C %{wasi_libc_dir} CC=clang AR=llvm-ar NM=llvm-nm
 %{lua: do
  local wasi_root = rpm.expand("%{wasi_libc_dir}") .. "/sysroot"
  local cfg = ""
@ -696,14 +729,20 @@ end}
 %configure --disable-option-checking \
  --libdir=%{common_libdir} \
  --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
-  %{target_config} \
+  --set target.%{rust_triple}.linker=%{__cc} \
+  --set target.%{rust_triple}.cc=%{__cc} \
+  --set target.%{rust_triple}.cxx=%{__cxx} \
+  --set target.%{rust_triple}.ar=%{__ar} \
+  --set target.%{rust_triple}.ranlib=%{__ranlib} \
  %{?mingw_target_config} \
  %{?wasm_target_config} \
  --python=%{__python3} \
  --local-rust-root=%{local_rust_root} \
+  --set build.rustfmt=/bin/true \
  %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
    %{!?llvm_has_filecheck: --disable-codegen-tests} \
    %{!?with_llvm_static: --enable-llvm-link-shared } } \
+  --disable-llvm-static-stdcpp \
  --disable-rpath \
  %{enable_debuginfo} \
  --set rust.codegen-units-std=1 \
@ -800,6 +839,11 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*
 # We don't want Rust copies of LLVM tools (rust-lld, rust-llvm-dwp)
 rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll*

+%if 0%{?rhel} && 0%{?rhel} >= 8
+# This allows users to build packages using Rust Toolset.
+%{__install} -D -m 644 %{S:100} %{buildroot}%{rpmmacrodir}/macros.rust-toolset
+%endif
+

 %check
 %{export_rust_env}
@ -993,7 +1037,20 @@ end}
 %{rustlibdir}/%{rust_triple}/analysis/


+%if 0%{?rhel} && 0%{?rhel} >= 8
+%files toolset
+%{rpmmacrodir}/macros.rust-toolset
+%endif
+
+
 %changelog
+* Fri Jun 03 2022 Josh Stone <jistone@redhat.com> - 1.61.0-1
+- Update to 1.61.0.
+- Add rust-toolset as a subpackage.
+
+* Wed Apr 20 2022 Josh Stone <jistone@redhat.com> - 1.60.0-1
+- Update to 1.60.0.
+
 * Tue Apr 19 2022 Josh Stone <jistone@redhat.com> - 1.59.0-1
 - Update to 1.59.0.