diff --git a/.abf.yml b/.abf.yml index 176bccd..4322b16 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,5 +1,5 @@ sources: - rust-1.44.0-aarch64-unknown-linux-gnu.tar.xz: 99735e094f28ae168907c902385f6df09c9545ac - rust-1.44.0-i686-unknown-linux-gnu.tar.xz: 96287d119e8008e13c09e421490a90cd8ed994ab - rust-1.44.0-x86_64-unknown-linux-gnu.tar.xz: 5bb798e722c7758454def598daec56362be0525c - rustc-1.45.2-src.tar.xz: ef2e4d6a728918cc78dd535a3d6d842fa485e8c7 + rust-1.45.2-aarch64-unknown-linux-gnu.tar.xz: 482602a622df75ea83e17a2c60986a7635055e5f + rust-1.45.2-i686-unknown-linux-gnu.tar.xz: 88aa07ce9a2dd265f18a6179fd78493a7cff043d + rust-1.45.2-x86_64-unknown-linux-gnu.tar.xz: 654f5ddbda9725c43d05079d69461448f940165c + rustc-1.46.0-src.tar.xz: 7fe631f9d8eb27a1443db17431b8922ca97cffe5 diff --git a/0001-Fix-jobserver_exists-test-on-single-cpu-systems.patch b/0001-Fix-jobserver_exists-test-on-single-cpu-systems.patch new file mode 100644 index 0000000..1650679 --- /dev/null +++ b/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/rust.spec b/rust.spec index 7043059..d3be6c8 100644 --- a/rust.spec +++ b/rust.spec @@ -25,9 +25,9 @@ # 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. -%define bootstrap_rust 1.44.0 -%define bootstrap_cargo 1.44.0 -%define bootstrap_date 2020-06-04 +%define bootstrap_rust 1.45.2 +%define bootstrap_cargo 1.45.2 +%define bootstrap_date 2020-08-03 %bcond_without bootstrap @@ -65,7 +65,7 @@ Summary: The Rust Programming Language Name: rust -Version: 1.45.2 +Version: 1.46.0 Release: 1 License: (ASL 2.0 or MIT) and (BSD and MIT) Group: Development/Rust @@ -77,6 +77,8 @@ Source1: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-x86_64-unknown Source2: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz Source3: https://static.rust-lang.org/dist/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz Source10: rust.rpmlintrc +# https://github.com/rust-lang/cargo/pull/8598 +Patch1: 0001-Fix-jobserver_exists-test-on-single-cpu-systems.patch BuildRequires: ncurses-devel BuildRequires: curl BuildRequires: pkgconfig(libcurl) @@ -90,7 +92,7 @@ BuildRequires: cmake >= 2.8.11 %if %{with clang} BuildRequires: clang %endif -BuildRequires: llvm-devel >= 6.0 +BuildRequires: llvm-devel >= 9.0 %if %{with llvm_static} BuildRequires: pkgconfig(libffi) %endif @@ -159,9 +161,9 @@ for %{name}-gdb and %{name}-lldb. %doc README.md COPYRIGHT LICENSE-APACHE LICENSE-MIT %dir %{rustlibdir} %dir %{rustlibdir}/etc -%{rustlibdir}/etc/debugger_*.py* +%{rustlibdir}/etc/rust_*.py* %if %{mdvver} >= 201910 -%{rustlibdir}/etc/__pycache__/debugger_*.py* +%{rustlibdir}/etc/__pycache__/rust_*.py* %endif #------------------------------------------------------------------------- @@ -358,6 +360,8 @@ test -f '%{local_rust_root}/bin/rustc' %setup -qn rustc-%{version}-src +patch1 -p1 -d src/tools/cargo + # python3 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure