Minor macro cleanups
This commit is contained in:
parent
3c6c44f0de
commit
95a5ba4a8e
16
rust.spec
16
rust.spec
|
@ -103,7 +103,7 @@ 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}/usr
|
||||||
Provides: bundled(%{name}-bootstrap) = %{bootstrap_rust}
|
Provides: bundled(%{name}-bootstrap) = %{bootstrap_rust}
|
||||||
%else
|
%else
|
||||||
BuildRequires: cargo >= %{bootstrap_cargo}
|
BuildRequires: cargo >= %{bootstrap_cargo}
|
||||||
|
@ -121,11 +121,7 @@ BuildRequires: python2
|
||||||
BuildRequires: curl
|
BuildRequires: curl
|
||||||
|
|
||||||
%if %with bundled_llvm
|
%if %with bundled_llvm
|
||||||
%if 0%{?epel}
|
|
||||||
BuildRequires: cmake3
|
BuildRequires: cmake3
|
||||||
%else
|
|
||||||
BuildRequires: cmake
|
|
||||||
%endif
|
|
||||||
Provides: bundled(llvm) = 3.9
|
Provides: bundled(llvm) = 3.9
|
||||||
%else
|
%else
|
||||||
%if 0%{?fedora} >= 26 || 0%{?epel}
|
%if 0%{?fedora} >= 26 || 0%{?epel}
|
||||||
|
@ -194,7 +190,7 @@ Requires: rust-rpm-macros
|
||||||
|
|
||||||
%if %{without bundled_llvm} && "%{llvm_root}" != "%{_prefix}"
|
%if %{without bundled_llvm} && "%{llvm_root}" != "%{_prefix}"
|
||||||
# https://github.com/rust-lang/rust/issues/40717
|
# https://github.com/rust-lang/rust/issues/40717
|
||||||
%global rustflags %{rustflags} -Clink-arg=-L%{llvm_root}/lib
|
%global rustflags %{?rustflags} -Clink-arg=-L%{llvm_root}/lib
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%description
|
%description
|
||||||
|
@ -267,7 +263,7 @@ its standard library.
|
||||||
%ifarch %{bootstrap_arches}
|
%ifarch %{bootstrap_arches}
|
||||||
%setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
|
%setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
|
||||||
./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
|
./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
|
||||||
--prefix=./%{_prefix} --disable-ldconfig
|
--prefix=%{local_rust_root} --disable-ldconfig
|
||||||
test -f '%{local_rust_root}/bin/cargo'
|
test -f '%{local_rust_root}/bin/cargo'
|
||||||
test -f '%{local_rust_root}/bin/rustc'
|
test -f '%{local_rust_root}/bin/rustc'
|
||||||
%endif
|
%endif
|
||||||
|
@ -311,7 +307,7 @@ sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||||
export RUSTFLAGS="%{rustflags}"
|
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
|
||||||
|
|
||||||
# We're going to override --libdir when configuring to get rustlib into a
|
# We're going to override --libdir when configuring to get rustlib into a
|
||||||
# common path, but we'll fix the shared libraries during install.
|
# common path, but we'll fix the shared libraries during install.
|
||||||
|
@ -335,7 +331,7 @@ export RUSTFLAGS="%{rustflags}"
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||||
export RUSTFLAGS="%{rustflags}"
|
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
|
||||||
|
|
||||||
DESTDIR=%{buildroot} ./x.py dist --install
|
DESTDIR=%{buildroot} ./x.py dist --install
|
||||||
|
|
||||||
|
@ -382,7 +378,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
|
||||||
export RUSTFLAGS="%{rustflags}"
|
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
|
||||||
|
|
||||||
# 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.
|
||||||
./x.py test || :
|
./x.py test || :
|
||||||
|
|
Loading…
Reference in New Issue