Merge branch 'master' into f30
This commit is contained in:
commit
6c5dea3f8c
|
@ -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
|
||||
|
|
17
rust.spec
17
rust.spec
|
@ -48,7 +48,7 @@
|
|||
%endif
|
||||
|
||||
Name: rust
|
||||
Version: 1.41.0
|
||||
Version: 1.41.1
|
||||
Release: 1%{?dist}
|
||||
Summary: The Rust Programming Language
|
||||
License: (ASL 2.0 or MIT) and (BSD and MIT)
|
||||
|
@ -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}
|
||||
|
@ -224,6 +226,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 +483,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 +534,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 +605,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.
|
||||
|
@ -715,6 +724,12 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 27 2020 Josh Stone <jistone@redhat.com> - 1.41.1-1
|
||||
- Update to 1.41.1.
|
||||
|
||||
* Thu Feb 20 2020 Josh Stone <jistone@redhat.com> - 1.41.0-2
|
||||
- Rebuild with llvm9.0
|
||||
|
||||
* Thu Jan 30 2020 Josh Stone <jistone@redhat.com> - 1.41.0-1
|
||||
- Update to 1.41.0.
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (rustc-1.41.0-src.tar.xz) = 0e30fe53b77860085bea0f1f60315eb835b00dd796c5d1b98ed44fe6fc27336dfb064908c86e1669a9cbe81c9ca1495e1c259a8a268bef23b23805a719cef0dd
|
||||
SHA512 (rustc-1.41.1-src.tar.xz) = ef33565c9cf4e27ca279072bfed3301e0276c09407d49727640746ba78d289de285278d64b1cce8708461fd6c97c7ab2ea8d56e7a4c4a23b2e66e2d164c35fc9
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue