From 9ed84e474be07ea2ef1f607168d78d07a5964cdbedd2e77a9fa0a2b122665d26 Mon Sep 17 00:00:00 2001 From: Luke Jones Date: Tue, 14 Feb 2017 02:26:36 +0000 Subject: [PATCH] Update spec to bootstrap only for releases less than TW or Leap 42.2. These releases as yet have no successful builds for which to build n+1 versions. OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=66 --- rust.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rust.spec b/rust.spec index c03d057..9cd5d1b 100644 --- a/rust.spec +++ b/rust.spec @@ -62,24 +62,23 @@ Conflicts: rustc-bootstrap Provides: rustc = %{version} Provides: rustc-stable = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Restrict the architectures as building rust relies on being initially +# bootstrapped before we can build the n+1 release ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64 ppc64le s390x %if 0%{?suse_version} BuildRequires: fdupes %endif -%ifarch %{arm} aarch64 ppc64 ppc64le s390x -BuildRequires: cargo-bootstrap -BuildRequires: rustc-bootstrap >= %{prev_version} -%else -%if %{with bootstrap} || (0%{?suse_version} < 1330 && 0%{?sle_version} < 120300) +# There are no successful builds for less than TW or Leap 42.2, so bootstrap +# until such time that there is. +%if %{with bootstrap} || (0%{?suse_version} < 1330 && 0%{?sle_version} < 120200) BuildRequires: cargo-bootstrap BuildRequires: rustc-bootstrap >= %{prev_version} %else BuildRequires: cargo BuildRequires: rust >= %{prev_version} %endif -%endif %description Rust is a systems programming language focused on three goals: