Luke Jones 2017-02-08 04:40:17 +00:00 committed by Git OBS Bridge
parent 524223508d
commit 9c2ce4d768

View File

@ -36,6 +36,7 @@
%global _arch i586 %global _arch i586
%endif %endif
%global rust_triple %{_arch}-unknown-linux-%{abi} %global rust_triple %{_arch}-unknown-linux-%{abi}
# to bootstrap, change to bcond_without
%bcond_without bootstrap %bcond_without bootstrap
Name: rust Name: rust
Version: 1.15.0 Version: 1.15.0
@ -49,7 +50,6 @@ Source1: config.toml
Source100: %{name}-rpmlintrc Source100: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs # PATCH-FIX-OPENSUSE: Set DT_SONAME when building dylibs
Patch1: add-soname.patch Patch1: add-soname.patch
BuildRequires: cargo
BuildRequires: cmake BuildRequires: cmake
BuildRequires: curl BuildRequires: curl
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -68,14 +68,17 @@ ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le
BuildRequires: fdupes BuildRequires: fdupes
%endif %endif
%ifnarch %{ix86} x86_64 %ifnarch %{ix86} x86_64
BuildRequires: cargo-bootstrap
BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap <= %{version}
BuildRequires: rustc-bootstrap >= %{prev_version} BuildRequires: rustc-bootstrap >= %{prev_version}
%else %else
%if %{with bootstrap} %if %{with bootstrap}
BuildRequires: cargo-bootstrap
BuildRequires: rustc-bootstrap <= %{version} BuildRequires: rustc-bootstrap <= %{version}
BuildRequires: rustc-bootstrap >= %{prev_version} BuildRequires: rustc-bootstrap >= %{prev_version}
%else %else
%if %{without bootstrap} %if %{without bootstrap}
BuildRequires: cargo
BuildRequires: rust <= %{version} BuildRequires: rust <= %{version}
BuildRequires: rust >= %{prev_version} BuildRequires: rust >= %{prev_version}
%endif %endif