/[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 1320577 by akien, Mon Oct 15 14:59:56 2018 UTC revision 1325525 by akien, Thu Oct 25 21:42:37 2018 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.28.0  %global bootstrap_rust 1.29.2
18  %global bootstrap_cargo 1.28.0  %global bootstrap_cargo 1.29.0
19  %global bootstrap_channel %{bootstrap_rust}  %global bootstrap_channel %{bootstrap_rust}
20  %global bootstrap_date 2018-08-02  %global bootstrap_date 2018-10-12
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 60  Line 60 
60  # Some sub-packages are versioned independently of the rust compiler and runtime itself.  # Some sub-packages are versioned independently of the rust compiler and runtime itself.
61  # Also beware that if any of these are not changed in a version bump, then the release  # Also beware that if any of these are not changed in a version bump, then the release
62  # number should still increase, not be reset to 1!  # number should still increase, not be reset to 1!
63  %global rustc_version 1.29.2  %global rustc_version 1.30.0
64  %global cargo_version 1.29.0  %global cargo_version 1.30.0
65  %global rustfmt_version 0.99.1  %global rustfmt_version 0.99.4
66  %global rls_version 0.130.0  %global rls_version 0.130.5
67  %global clippy_version 0.0.212  %global clippy_version 0.0.212
68    
69  Name:           rust  Name:           rust
70  Version:        %{rustc_version}  Version:        %{rustc_version}
71  Release:        %mkrel 2  Release:        %mkrel 3
72  Summary:        The Rust Programming Language  Summary:        The Rust Programming Language
73  %if 0%{?mageia}  %if 0%{?mageia}
74  Group:          Development/Other  Group:          Development/Other
# Line 85  ExclusiveArch:  %{rust_arches} Line 85  ExclusiveArch:  %{rust_arches}
85  %endif  %endif
86  Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz  Source0:        https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
87    
 # https://github.com/rust-lang/rust/pull/52876  
 Patch1:         rust-52876-const-endianess.patch  
   
 # https://github.com/rust-lang/rust/pull/53436  
 Patch2:         0001-std-stop-backtracing-when-the-frames-are-full.patch  
   
 # https://github.com/rust-lang/rust/pull/53437  
 Patch3:         0001-Set-more-llvm-function-attributes-for-__rust_try.patch  
   
88  # Get the Rust triple for any arch.  # Get the Rust triple for any arch.
89  %{lua: function rust_triple(arch)  %{lua: function rust_triple(arch)
90    local abi = "gnu"    local abi = "gnu"
# Line 440  test -f '%{local_rust_root}/bin/rustc' Line 431  test -f '%{local_rust_root}/bin/rustc'
431    
432  %setup -q -n %{rustc_package}  %setup -q -n %{rustc_package}
433    
 %patch1 -p1  
 %patch2 -p1  
 %patch3 -p1  
   
434  %if "%{python}" == "python3"  %if "%{python}" == "python3"
435  sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure  sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
436  %endif  %endif
# Line 458  rm -rf src/llvm/ Line 445  rm -rf src/llvm/
445  # We never enable emscripten.  # We never enable emscripten.
446  rm -rf src/llvm-emscripten/  rm -rf src/llvm-emscripten/
447    
448    # We never enable other LLVM tools.
449    rm -rf src/tools/clang
450    rm -rf src/tools/lld
451    rm -rf src/tools/lldb
452    
453  # extract bundled licenses for packaging  # extract bundled licenses for packaging
454  sed -e '/*\//q' src/libbacktrace/backtrace.h \  sed -e '/*\//q' src/libbacktrace/backtrace.h \
455    >src/libbacktrace/LICENSE-libbacktrace    >src/libbacktrace/LICENSE-libbacktrace
456    
 # This tests a problem of exponential growth, which seems to be less-reliably  
 # fixed when running on older LLVM and/or some arches.  Just skip it for now.  
 sed -i.ignore -e '1i // ignore-test may still be exponential...' \  
   src/test/run-pass/issue-41696.rs  
   
457  %if %{with bundled_llvm} && 0%{?epel}  %if %{with bundled_llvm} && 0%{?epel}
458  mkdir -p cmake-bin  mkdir -p cmake-bin
459  ln -s /usr/bin/cmake3 cmake-bin/cmake  ln -s /usr/bin/cmake3 cmake-bin/cmake
# Line 511  export LIBSSH2_SYS_USE_PKG_CONFIG=1 Line 498  export LIBSSH2_SYS_USE_PKG_CONFIG=1
498  %ifarch %{arm} %{ix86}  %ifarch %{arm} %{ix86}
499  # full debuginfo is exhausting memory; just do libstd for now  # full debuginfo is exhausting memory; just do libstd for now
500  # https://github.com/rust-lang/rust/issues/45854  # https://github.com/rust-lang/rust/issues/45854
501    %if (0%{?fedora} && 0%{?fedora} < 27) || (0%{?rhel} && 0%{?rhel} <= 7)
502    # Older rpmbuild didn't work with partial debuginfo coverage.
503    %global debug_package %{nil}
504    %define enable_debuginfo --disable-debuginfo --disable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines
505    %else
506  %define enable_debuginfo --enable-debuginfo --enable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines  %define enable_debuginfo --enable-debuginfo --enable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines
507    %endif
508  %else  %else
509  %define enable_debuginfo --enable-debuginfo --disable-debuginfo-only-std --enable-debuginfo-tools --disable-debuginfo-lines  %define enable_debuginfo --enable-debuginfo --disable-debuginfo-only-std --enable-debuginfo-tools --disable-debuginfo-lines
510  %endif  %endif
Legend:
Removed from v.1320577  
changed lines
  Added in v.1325525
  ViewVC Help
Powered by ViewVC 1.1.30