rpms
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

beta: cargo version, add gdb, fix cmake3

This commit is contained in:
Josh Stone 2017-03-02 17:00:21 -08:00
parent 91ea22b352
commit 1dfccb7e3f
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rust.spec
View File

@ -8,7 +8,9 @@
# To bootstrap from scratch, set the channel and date from src/stage0.txt # To bootstrap from scratch, set the channel and date from src/stage0.txt
# 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
# or nightly wants some beta-YYYY-MM-DD # or nightly wants some beta-YYYY-MM-DD
%global bootstrap_channel 1.15.1 %global bootstrap_rust 1.15.1
%global bootstrap_cargo 0.16.0
%global bootstrap_channel %{bootstrap_rust}
%global bootstrap_date 2017-02-09 %global bootstrap_date 2017-02-09
# Only the specified arches will use bootstrap binaries. # Only the specified arches will use bootstrap binaries.
@ -97,10 +99,10 @@ end}
%ifarch %{bootstrap_arches} %ifarch %{bootstrap_arches}
%global bootstrap_root rust-%{bootstrap_channel}-%{rust_triple} %global bootstrap_root rust-%{bootstrap_channel}-%{rust_triple}
%global local_rust_root %{_builddir}/%{bootstrap_root}%{_prefix} %global local_rust_root %{_builddir}/%{bootstrap_root}%{_prefix}
Provides: bundled(%{name}-bootstrap) = %{bootstrap_channel} Provides: bundled(%{name}-bootstrap) = %{bootstrap_rust}
%else %else
BuildRequires: cargo BuildRequires: cargo >= %{bootstrap_cargo}
BuildRequires: %{name} >= %{bootstrap_channel} BuildRequires: %{name} >= %{bootstrap_rust}
BuildConflicts: %{name} > %{version} BuildConflicts: %{name} > %{version}
%global local_rust_root %{_prefix} %global local_rust_root %{_prefix}
%endif %endif
@ -135,6 +137,9 @@ BuildConflicts: llvm-static
# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs # make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
BuildRequires: procps-ng BuildRequires: procps-ng
# debuginfo-gdb tests need gdb
BuildRequires: gdb
# TODO: work on unbundling these! # TODO: work on unbundling these!
Provides: bundled(hoedown) = 3.0.5 Provides: bundled(hoedown) = 3.0.5
Provides: bundled(jquery) = 2.1.4 Provides: bundled(jquery) = 2.1.4
@ -162,7 +167,7 @@ Requires: rust-rpm-macros
%endif %endif
# ALL Rust libraries are private, because they don't keep an ABI. # ALL Rust libraries are private, because they don't keep an ABI.
%global _privatelibs lib.*-[[:xdigit:]]{8}[.]so.* %global _privatelibs lib.*-[[:xdigit:]]*[.]so.*
%global __provides_exclude ^(%{_privatelibs})$ %global __provides_exclude ^(%{_privatelibs})$
%global __requires_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$
@ -255,7 +260,9 @@ sed -i.jemalloc -e '1i // ignore-test jemalloc is disabled' \
src/test/run-pass/allocator-default.rs src/test/run-pass/allocator-default.rs
%if 0%{?epel} %if 0%{?epel}
sed -i.cmake -e 's/CFG_CMAKE cmake/&3/' configure mkdir -p cmake-bin
ln -s /usr/bin/cmake3 cmake-bin/cmake
%global cmake_path $PWD/cmake-bin
%endif %endif
%if %{without bundled_llvm} && %{with llvm_static} %if %{without bundled_llvm} && %{with llvm_static}
@ -270,6 +277,8 @@ sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
%build %build
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
# Use hardening ldflags. # Use hardening ldflags.
%global rustflags -Clink-arg=-Wl,-z,relro,-z,now %global rustflags -Clink-arg=-Wl,-z,relro,-z,now
export RUSTFLAGS="%{rustflags}" export RUSTFLAGS="%{rustflags}"
@ -295,6 +304,7 @@ export RUSTFLAGS="%{rustflags}"
%install %install
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
export RUSTFLAGS="%{rustflags}" export RUSTFLAGS="%{rustflags}"
%make_install %make_install
@ -333,12 +343,13 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
%check %check
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
export RUSTFLAGS="%{rustflags}" export RUSTFLAGS="%{rustflags}"
# Note, many of the tests execute in parallel threads, # Note, many of the tests execute in parallel threads,
# so it's better not to use a parallel make here. # so it's better not to use a parallel make here.
# The results are not stable on koji, so mask errors and just log it. # The results are not stable on koji, so mask errors and just log it.
make check || python2 src/etc/check-summary.py tmp/*.log || : make check || :
%post -p /sbin/ldconfig %post -p /sbin/ldconfig