diff --git a/.gitignore b/.gitignore index 8a23bf0..7697c38 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rustc-1.42.0-src.tar.xz +SOURCES/rustc-1.44.1-src.tar.xz diff --git a/.rust.metadata b/.rust.metadata index 988052d..f36f70f 100644 --- a/.rust.metadata +++ b/.rust.metadata @@ -1 +1 @@ -184dd270e306ec22249795d41220c3c231e7cfa2 SOURCES/rustc-1.42.0-src.tar.xz +a5276687cf61f884177aed3c7230f166bc87a9f0 SOURCES/rustc-1.44.1-src.tar.xz diff --git a/SOURCES/0001-Drop-cfg-bootstrap-code.patch b/SOURCES/0001-Drop-cfg-bootstrap-code.patch deleted file mode 100644 index 3d8f202..0000000 --- a/SOURCES/0001-Drop-cfg-bootstrap-code.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 31dcdc9e13c324d33a18db3aed7f4b3208ff3744 Mon Sep 17 00:00:00 2001 -From: Mark Rousskov -Date: Fri, 31 Jan 2020 12:30:17 -0500 -Subject: [PATCH] Drop cfg(bootstrap) code - ---- - src/bootstrap/lib.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs -index 1fee3fd9ac1d..637323331f58 100644 ---- a/src/bootstrap/lib.rs -+++ b/src/bootstrap/lib.rs -@@ -1026,7 +1026,7 @@ impl Build { - } - - fn llvm_link_tools_dynamically(&self, target: Interned) -> bool { -- (target.contains("linux-gnu") || target.contains("apple-darwin")) -+ target.contains("linux-gnu") || target.contains("apple-darwin") - } - - /// Returns the `version` string associated with this compiler for Rust --- -2.24.1 - diff --git a/SOURCES/rust-pr57840-llvm7-debuginfo-variants.patch b/SOURCES/rust-pr57840-llvm7-debuginfo-variants.patch deleted file mode 100644 index b1fd427..0000000 --- a/SOURCES/rust-pr57840-llvm7-debuginfo-variants.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit ab998a2eeb2bcdc69ce70c814af97f0d1302a404 (from d17f62d857c70508efbf60be41135880bcd2e062) -Merge: d17f62d857c7 9452a8dfa3ba -Author: Mazdak Farrokhzad -Date: Thu Jan 24 00:20:00 2019 +0100 - - Rollup merge of #57840 - tromey:fix-issue-57762, r=nikic - - Fix issue 57762 - - against a stock LLVM 7. LLVM 7 was released without a necessary fix - for a bug in the DWARF discriminant code. - - This patch changes rustc to use the fallback mode on (non-Rust) LLVM 7. - - Closes #57762 - -diff --git a/src/librustc_codegen_llvm/debuginfo/metadata.rs b/src/librustc_codegen_llvm/debuginfo/metadata.rs -index 6deedd0b5ea3..9f63038c3623 100644 ---- a/src/librustc_codegen_llvm/debuginfo/metadata.rs -+++ b/src/librustc_codegen_llvm/debuginfo/metadata.rs -@@ -1164,7 +1164,10 @@ fn use_enum_fallback(cx: &CodegenCx) -> bool { - // On MSVC we have to use the fallback mode, because LLVM doesn't - // lower variant parts to PDB. - return cx.sess().target.target.options.is_like_msvc -- || llvm_util::get_major_version() < 7; -+ // LLVM version 7 did not release with an important bug fix; -+ // but the required patch is in the LLVM 8. Rust LLVM reports -+ // 8 as well. -+ || llvm_util::get_major_version() < 8; - } - - // FIXME(eddyb) maybe precompute this? Right now it's computed once diff --git a/SOURCES/rust-pr71782-Use-a-non-existent-test-path.patch b/SOURCES/rust-pr71782-Use-a-non-existent-test-path.patch new file mode 100644 index 0000000..463cb61 --- /dev/null +++ b/SOURCES/rust-pr71782-Use-a-non-existent-test-path.patch @@ -0,0 +1,56 @@ +From fbd3fbdb24563a9d8fd3651f6bdc90bbbbd81d3e Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Fri, 1 May 2020 16:50:10 -0700 +Subject: [PATCH] Use a non-existent test path instead of clobbering /dev/null + +--- + src/test/ui/non-ice-error-on-worker-io-fail.rs | 10 +++++++--- + src/test/ui/non-ice-error-on-worker-io-fail.stderr | 2 +- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.rs b/src/test/ui/non-ice-error-on-worker-io-fail.rs +index 8af17742850d..30779fc65c0f 100644 +--- a/src/test/ui/non-ice-error-on-worker-io-fail.rs ++++ b/src/test/ui/non-ice-error-on-worker-io-fail.rs +@@ -4,8 +4,12 @@ + // + // An attempt to `-o` into a directory we cannot write into should indeed + // be an error; but not an ICE. ++// ++// However, some folks run tests as root, which can write `/dev/` and end ++// up clobbering `/dev/null`. Instead we'll use a non-existent path, which ++// also used to ICE, but even root can't magically write there. + +-// compile-flags: -o /dev/null ++// compile-flags: -o /does-not-exist/output + + // The error-pattern check occurs *before* normalization, and the error patterns + // are wildly different between build environments. So this is a cop-out (and we +@@ -15,10 +19,10 @@ + // error-pattern: error + + // On Mac OS X, we get an error like the below +-// normalize-stderr-test "failed to write bytecode to /dev/null.non_ice_error_on_worker_io_fail.*" -> "io error modifying /dev/" ++// normalize-stderr-test "failed to write bytecode to /does-not-exist/output.non_ice_error_on_worker_io_fail.*" -> "io error modifying /does-not-exist/" + + // On Linux, we get an error like the below +-// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /dev/" ++// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /does-not-exist/" + + // ignore-tidy-linelength + // ignore-windows - this is a unix-specific test +diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.stderr b/src/test/ui/non-ice-error-on-worker-io-fail.stderr +index f732abc52b71..edadecf273a7 100644 +--- a/src/test/ui/non-ice-error-on-worker-io-fail.stderr ++++ b/src/test/ui/non-ice-error-on-worker-io-fail.stderr +@@ -1,6 +1,6 @@ + warning: ignoring --out-dir flag due to -o flag + +-error: io error modifying /dev/ ++error: io error modifying /does-not-exist/ + + error: aborting due to previous error; 1 warning emitted + +-- +2.26.2 + diff --git a/SPECS/rust.spec b/SPECS/rust.spec index 8fdd67a..c64d4e0 100644 --- a/SPECS/rust.spec +++ b/SPECS/rust.spec @@ -10,10 +10,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.41.0 -%global bootstrap_cargo 1.41.0 -%global bootstrap_channel 1.41.1 -%global bootstrap_date 2020-02-27 +%global bootstrap_rust 1.43.1 +%global bootstrap_cargo 1.43.1 +%global bootstrap_channel 1.43.1 +%global bootstrap_date 2020-05-07 # Only the specified arches will use bootstrap binaries. #global bootstrap_arches %%{rust_arches} @@ -49,7 +49,7 @@ %endif Name: rust -Version: 1.42.0 +Version: 1.44.1 Release: 1%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) @@ -64,13 +64,8 @@ ExclusiveArch: %{rust_arches} %endif Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz -# Revert https://github.com/rust-lang/rust/pull/57840 -# We do have the necessary fix in our LLVM 7. -Patch1: rust-pr57840-llvm7-debuginfo-variants.patch - -# Fix 1.42 bootstrapping itself -# https://github.com/rust-lang/rust/issues/69953 -Patch2: 0001-Drop-cfg-bootstrap-code.patch +# https://github.com/rust-lang/rust/pull/71782 +Patch1: rust-pr71782-Use-a-non-existent-test-path.patch # Disable cargo->libgit2->libssh2, as it's not approved for FIPS (rhbz1732949) Patch10: rustc-1.42.0-disable-libssh2.patch @@ -138,7 +133,7 @@ BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(zlib) %if %without bundled_libgit2 -BuildRequires: pkgconfig(libgit2) >= 0.27 +BuildRequires: pkgconfig(libgit2) >= 1.0.0 %endif %if %{without disabled_libssh2} && %{without bundled_libssh2} @@ -159,13 +154,10 @@ BuildRequires: %{python} %if %with bundled_llvm BuildRequires: cmake3 >= 3.4.3 -Provides: bundled(llvm) = 9.0.0 +Provides: bundled(llvm) = 9.0.1 %else BuildRequires: cmake >= 2.8.11 %if 0%{?epel} -%global llvm llvm7.0 -%endif -%if 0%{?fedora} >= 32 %global llvm llvm9.0 %endif %if %defined llvm @@ -174,7 +166,7 @@ BuildRequires: cmake >= 2.8.11 %global llvm llvm %global llvm_root %{_prefix} %endif -BuildRequires: %{llvm}-devel >= 7.0 +BuildRequires: %{llvm}-devel >= 8.0 %if %with llvm_static BuildRequires: %{llvm}-static BuildRequires: libffi-devel @@ -188,7 +180,7 @@ BuildRequires: procps-ng BuildRequires: gdb # TODO: work on unbundling these! -Provides: bundled(libbacktrace) = 8.1.0 +Provides: bundled(libbacktrace) = 1.0.20200219 # Virtual provides for folks who attempt "dnf install rustc" Provides: rustc = %{version}-%{release} @@ -228,10 +220,6 @@ Requires: /usr/bin/cc %if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1} %global llvm_has_filecheck 1 %endif -%if "%{llvm_root}" != "%{_prefix}" -# https://github.com/rust-lang/rust/issues/68714 -%global library_path $(%{llvm_root}/bin/llvm-config --libdir) -%endif %endif %description @@ -303,7 +291,7 @@ its standard library. %package -n cargo Summary: Rust's package manager and build tool %if %with bundled_libgit2 -Provides: bundled(libgit2) = 0.28.2 +Provides: bundled(libgit2) = 1.0.0 %endif %if %with bundled_libssh2 Provides: bundled(libssh2) = 1.9.0~dev @@ -349,7 +337,7 @@ A tool for formatting Rust code according to style guidelines. %package -n rls Summary: Rust Language Server for IDE integration %if %with bundled_libgit2 -Provides: bundled(libgit2) = 0.28.2 +Provides: bundled(libgit2) = 1.0.0 %endif %if %with bundled_libssh2 Provides: bundled(libssh2) = 1.9.0~dev @@ -414,8 +402,7 @@ test -f '%{local_rust_root}/bin/rustc' %setup -q -n %{rustc_package} -%patch1 -p1 -R -%patch2 -p1 +%patch1 -p1 %if %with disabled_libssh2 %patch10 -p1 @@ -478,6 +465,11 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+' %build +# This package fails to build with LTO due to undefined symbols. LTO +# was disabled in OpenSuSE as well, but with no real explanation why +# beyond the undefined symbols. It really should be investigated further. +# Disable LTO +%define _lto_cflags %{nil} %if %without bundled_libgit2 # convince libgit2-sys to use the distro libgit2 @@ -490,7 +482,6 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1 %endif %{?cmake_path:export PATH=%{cmake_path}:$PATH} -%{?library_path:export LIBRARY_PATH="%{library_path}"} %{?rustflags:export RUSTFLAGS="%{rustflags}"} # We're going to override --libdir when configuring to get rustlib into a @@ -541,7 +532,6 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1 %install %{?cmake_path:export PATH=%{cmake_path}:$PATH} -%{?library_path:export LIBRARY_PATH="%{library_path}"} %{?rustflags:export RUSTFLAGS="%{rustflags}"} DESTDIR=%{buildroot} %{python} ./x.py install @@ -612,7 +602,6 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %check %{?cmake_path:export PATH=%{cmake_path}:$PATH} -%{?library_path:export LIBRARY_PATH="%{library_path}"} %{?rustflags:export RUSTFLAGS="%{rustflags}"} # The results are not stable on koji, so mask errors and just log it. @@ -731,6 +720,15 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog +* Tue Jul 14 2020 Josh Stone - 1.44.1-1 +- Update to 1.44.1. + +* Thu May 07 2020 Josh Stone - 1.43.1-1 +- Update to 1.43.1. + +* Thu Apr 23 2020 Josh Stone - 1.43.0-1 +- Update to 1.43.0. + * Thu Mar 12 2020 Josh Stone - 1.42.0-1 - Update to 1.42.0.