diff --git a/.gitignore b/.gitignore index f04a2ff..1dc9ca7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rustc-1.45.0-src.tar.xz +SOURCES/rustc-1.45.2-src.tar.xz diff --git a/.rust.metadata b/.rust.metadata index 6351c58..9082dca 100644 --- a/.rust.metadata +++ b/.rust.metadata @@ -1,2 +1 @@ -7447f361432a8c569eb5b5ab85b784a898dd61d2 SOURCES/rustc-1.45.0-src.tar.xz -b2b17448384bc9e972bb275e0a40afc4128fde1e SOURCES/rust-1.44.0-armv7-unknown-linux-gnueabihf.tar.xz +ef2e4d6a728918cc78dd535a3d6d842fa485e8c7 SOURCES/rustc-1.45.2-src.tar.xz diff --git a/SOURCES/0001-Fix-jobserver_exists-test-on-single-cpu-systems.patch b/SOURCES/0001-Fix-jobserver_exists-test-on-single-cpu-systems.patch new file mode 100644 index 0000000..1650679 --- /dev/null +++ b/SOURCES/0001-Fix-jobserver_exists-test-on-single-cpu-systems.patch @@ -0,0 +1,29 @@ +From 02fc16aece46abcd23d2ade2d969497f07fe26ab Mon Sep 17 00:00:00 2001 +From: Alex Crichton +Date: Fri, 7 Aug 2020 12:50:25 -0700 +Subject: [PATCH] Fix jobserver_exists test on single-cpu systems + +Closes #8595 +--- + tests/testsuite/jobserver.rs | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tests/testsuite/jobserver.rs b/tests/testsuite/jobserver.rs +index 9e91c956cd75..16518ee2c614 100644 +--- a/tests/testsuite/jobserver.rs ++++ b/tests/testsuite/jobserver.rs +@@ -51,7 +51,10 @@ fn jobserver_exists() { + .file("src/lib.rs", "") + .build(); + +- p.cargo("build").run(); ++ // Explicitly use `-j2` to ensure that there's eventually going to be a ++ // token to read from `valdiate` above, since running the build script ++ // itself consumes a token. ++ p.cargo("build -j2").run(); + } + + #[cargo_test] +-- +2.26.2 + diff --git a/SPECS/rust.spec b/SPECS/rust.spec index 350fd2c..0b2cfe1 100644 --- a/SPECS/rust.spec +++ b/SPECS/rust.spec @@ -1,7 +1,7 @@ # Only x86_64 and i686 are Tier 1 platforms at this time. # https://forge.rust-lang.org/platform-support.html -%global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x -#global rust_arches x86_64 i686 aarch64 ppc64le s390x +#global rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x +%global rust_arches x86_64 i686 aarch64 ppc64le s390x # The channel can be stable, beta, or nightly %{!?channel: %global channel stable} @@ -16,7 +16,7 @@ %global bootstrap_date 2020-06-04 # Only the specified arches will use bootstrap binaries. -%global bootstrap_arches armv7hl +#global bootstrap_arches %%{rust_arches} # Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases. %bcond_with llvm_static @@ -49,7 +49,7 @@ %endif Name: rust -Version: 1.45.0 +Version: 1.45.2 Release: 1%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) @@ -64,6 +64,9 @@ ExclusiveArch: %{rust_arches} %endif Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz +# https://github.com/rust-lang/cargo/pull/8598 +Patch1: 0001-Fix-jobserver_exists-test-on-single-cpu-systems.patch + # Disable cargo->libgit2->libssh2, as it's not approved for FIPS (rhbz1732949) Patch10: rustc-1.42.0-disable-libssh2.patch @@ -399,6 +402,8 @@ test -f '%{local_rust_root}/bin/rustc' %setup -q -n %{rustc_package} +%patch1 -p1 -d src/tools/cargo + %if %with disabled_libssh2 %patch10 -p1 %endif @@ -723,6 +728,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog +* Tue Aug 04 2020 Josh Stone - 1.45.2-1 +- Update to 1.45.2. + * Thu Jul 16 2020 Josh Stone - 1.45.0-1 - Update to 1.45.0.