/[packages]/cauldron/rust/current/SPECS/rust.spec
ViewVC logotype

Diff of /cauldron/rust/current/SPECS/rust.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1399021 by akien, Fri May 24 12:06:02 2019 UTC revision 1419248 by akien, Sun Jul 7 11:00:25 2019 UTC
# Line 14  Line 14 
14  # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24  # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
15  # or nightly wants some beta-YYYY-MM-DD  # or nightly wants some beta-YYYY-MM-DD
16  # Note that cargo matches the program version here, not its crate version.  # Note that cargo matches the program version here, not its crate version.
17  %global bootstrap_rust 1.34.0  %global bootstrap_rust 1.35.0
18  %global bootstrap_cargo 1.34.0  %global bootstrap_cargo 1.35.0
19  %global bootstrap_channel 1.34.2  %global bootstrap_channel 1.35.0
20  %global bootstrap_date 2019-05-14  %global bootstrap_date 2019-05-23
21    
22  # Only the specified arches will use bootstrap binaries.  # Only the specified arches will use bootstrap binaries.
23  #global bootstrap_arches %%{rust_arches}  #global bootstrap_arches %%{rust_arches}
# Line 37  Line 37 
37  %bcond_with llvm_static  %bcond_with llvm_static
38    
39  # We can also choose to just use Rust's bundled LLVM, in case the system LLVM  # We can also choose to just use Rust's bundled LLVM, in case the system LLVM
40  # is insufficient.  Rust currently requires LLVM 5.0+.  # is insufficient.  Rust currently requires LLVM 6.0+.
41  %if 0%{?rhel} && !0%{?epel}  %if 0%{?rhel} && !0%{?epel}
42  %bcond_without bundled_llvm  %bcond_without bundled_llvm
43  %else  %else
# Line 64  Line 64 
64  %endif  %endif
65    
66  Name:           rust  Name:           rust
67  Version:        1.35.0  Version:        1.36.0
68  Release:        %mkrel 1  Release:        %mkrel 1
69  Summary:        The Rust Programming Language  Summary:        The Rust Programming Language
70  %if 0%{?mageia}  %if 0%{?mageia}
# Line 86  Source0:        https://static.rust-lang Line 86  Source0:        https://static.rust-lang
86  # We do have the necessary fix in our LLVM 7.  # We do have the necessary fix in our LLVM 7.
87  Patch1:         rust-pr57840-llvm7-debuginfo-variants.patch  Patch1:         rust-pr57840-llvm7-debuginfo-variants.patch
88    
 # https://github.com/rust-lang/rust/pull/60313  
 Patch2:         0001-Limit-internalization-in-LLVM-8-ThinLTO.patch  
   
 # https://github.com/rust-lang/rust/pull/61085  
 Patch3:         rust-pr61085-fix-ICE-with-incorrect-turbofish.patch  
   
89  # Upstream patch to fix typenum crate build on i386/i486/i586.  # Upstream patch to fix typenum crate build on i386/i486/i586.
90  Patch4:         typenum-pr115-fix-log2-rounding-error.patch  Patch2:         typenum-pr115-fix-log2-rounding-error.patch
91    
92  # Get the Rust triple for any arch.  # Get the Rust triple for any arch.
93  %{lua: function rust_triple(arch)  %{lua: function rust_triple(arch)
# Line 181  BuildRequires:  %{python} Line 175  BuildRequires:  %{python}
175    
176  %if %with bundled_llvm  %if %with bundled_llvm
177  BuildRequires:  cmake3 >= 3.4.3  BuildRequires:  cmake3 >= 3.4.3
178  Provides:       bundled(llvm) = 8.0.0~svn  Provides:       bundled(llvm) = 8.0.0
179  %else  %else
180  BuildRequires:  cmake >= 2.8.11  BuildRequires:  cmake >= 2.8.11
181  %if 0%{?epel}  %if 0%{?epel}
# Line 294  programs. Line 288  programs.
288  Summary:        LLDB pretty printers for Rust  Summary:        LLDB pretty printers for Rust
289  BuildArch:      noarch  BuildArch:      noarch
290  Requires:       lldb  Requires:       lldb
291    %if 0%{?fedora} >= 31
292    Requires:       python3-lldb
293    %else
294  Requires:       python2-lldb  Requires:       python2-lldb
295    %endif
296  Requires:       %{name}-debugger-common = %{version}-%{release}  Requires:       %{name}-debugger-common = %{version}-%{release}
297    
298  %description lldb  %description lldb
# Line 427  test -f '%{local_rust_root}/bin/rustc' Line 425  test -f '%{local_rust_root}/bin/rustc'
425    
426  %patch1 -p1 -R  %patch1 -p1 -R
427  %patch2 -p1  %patch2 -p1
 %patch3 -p1  
 %patch4 -p1  
428    
429  %if "%{python}" == "python3"  %if "%{python}" == "python3"
430  sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure  sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
# Line 673  rm -f %{buildroot}%{rustlibdir}/etc/lldb Line 669  rm -f %{buildroot}%{rustlibdir}/etc/lldb
669  %{_docdir}/%{name}/html/*.svg  %{_docdir}/%{name}/html/*.svg
670  %{_docdir}/%{name}/html/*.woff  %{_docdir}/%{name}/html/*.woff
671  %license %{_docdir}/%{name}/html/*.txt  %license %{_docdir}/%{name}/html/*.txt
672    %license %{_docdir}/%{name}/html/*.md
673    
674    
675  %files -n cargo  %files -n cargo

Legend:
Removed from v.1399021  
changed lines
  Added in v.1419248

  ViewVC Help
Powered by ViewVC 1.1.30