From a22d8f719ca0e18ecbfc7dd3761ddcf0c8146072 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 31 Jan 2020 13:50:52 -0800 Subject: [PATCH 1/4] Reintroduce the workaround for LLVM library path This reverts commit 93ecbc5a139208a2eeff691980d8e513b6b1b406, reintroducing the workaround for rust#40717, now rust#68714. --- rust.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rust.spec b/rust.spec index 5ea65c1..cab311c 100644 --- a/rust.spec +++ b/rust.spec @@ -224,6 +224,10 @@ 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 @@ -477,6 +481,7 @@ 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 @@ -527,6 +532,7 @@ 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 @@ -597,6 +603,7 @@ 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. From 9b4ad1ffb1b385d4a4ca77445ae564067195ef03 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 20 Feb 2020 14:49:18 -0800 Subject: [PATCH 2/4] Rebuild with llvm9.0 --- rust.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rust.spec b/rust.spec index cab311c..bb1bd1c 100644 --- a/rust.spec +++ b/rust.spec @@ -49,7 +49,7 @@ Name: rust Version: 1.41.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) # ^ written as: (rust itself) and (bundled libraries) @@ -162,6 +162,8 @@ Provides: bundled(llvm) = 9.0.0 BuildRequires: cmake >= 2.8.11 %if 0%{?epel} %global llvm llvm7.0 +%elif 0%{?fedora} >= 32 +%global llvm llvm9.0 %endif %if %defined llvm %global llvm_root %{_libdir}/%{llvm} @@ -722,6 +724,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog +* Thu Feb 20 2020 Josh Stone - 1.41.0-2 +- Rebuild with llvm9.0 + * Thu Jan 30 2020 Josh Stone - 1.41.0-1 - Update to 1.41.0. From 269b322b5cd802fe6db8517d23ba0aae3480700d Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 27 Feb 2020 09:21:31 -0800 Subject: [PATCH 3/4] Update to 1.41.1. --- rust.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rust.spec b/rust.spec index bb1bd1c..1e618cc 100644 --- a/rust.spec +++ b/rust.spec @@ -48,8 +48,8 @@ %endif Name: rust -Version: 1.41.0 -Release: 2%{?dist} +Version: 1.41.1 +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) @@ -724,6 +724,9 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py* %changelog +* Thu Feb 27 2020 Josh Stone - 1.41.1-1 +- Update to 1.41.1. + * Thu Feb 20 2020 Josh Stone - 1.41.0-2 - Rebuild with llvm9.0 From f5e3ba57291326d8d55ef7c060b19fd09630904c Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 27 Feb 2020 09:23:45 -0800 Subject: [PATCH 4/4] fedpkg new-sources --- .gitignore | 1 + sources | 2 +- sources-bootstrap | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f487e25..89b4046 100644 --- a/.gitignore +++ b/.gitignore @@ -252,3 +252,4 @@ /rust-1.40.0-powerpc64-unknown-linux-gnu.tar.xz /rust-1.40.0-s390x-unknown-linux-gnu.tar.xz /rust-1.40.0-x86_64-unknown-linux-gnu.tar.xz +/rustc-1.41.1-src.tar.xz diff --git a/sources b/sources index cbe64cc..8b5147c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rustc-1.41.0-src.tar.xz) = 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd +SHA512 (rustc-1.41.1-src.tar.xz) = ef33565c9cf4e27ca279072bfed3301e0276c09407d49727640746ba78d289de285278d64b1cce8708461fd6c97c7ab2ea8d56e7a4c4a23b2e66e2d164c35fc9 diff --git a/sources-bootstrap b/sources-bootstrap index ae403f7..ad40ecc 100644 --- a/sources-bootstrap +++ b/sources-bootstrap @@ -1,4 +1,4 @@ -SHA512 (rustc-1.41.0-src.tar.xz) = 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd +SHA512 (rustc-1.41.1-src.tar.xz) = ef33565c9cf4e27ca279072bfed3301e0276c09407d49727640746ba78d289de285278d64b1cce8708461fd6c97c7ab2ea8d56e7a4c4a23b2e66e2d164c35fc9 SHA512 (rust-1.40.0-aarch64-unknown-linux-gnu.tar.xz) = f601e4251e08a6d66edb0489b6ab840b57622b506547e81036e6dfe08eb71005a22a2777a0b8b2d07a6f88286d58f513482b863116311a6f43c7284769af6e7f SHA512 (rust-1.40.0-armv7-unknown-linux-gnueabihf.tar.xz) = d3345946c5a3d5cb3d7fca4d3200710704d64547ebfa4ab11c45ea1a18ca3c49b429783d499845f31dcb150abe2f6836fe203fd9d7aa53e0475b940da5549492 SHA512 (rust-1.40.0-i686-unknown-linux-gnu.tar.xz) = d727149afbbc3b2709360dd6080ff301e781aaa94459c1348d3e35382bc9c7ad65c4d70f9bfc7b44ac92ddaf89e3aab92b75b9d184eba86916da25bd629592b6