pool/rust
SHA256
11
0
Fork 2
Code Issues Pull Requests Activity

Accepting request 453583 from devel:languages:rust

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/453583
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rust?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger
2017-02-01 08:53:40 +00:00
committed by Git OBS Bridge
parent e302163019 02b41e2182
commit 39a0b15467
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rust.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Jan 31 09:41:33 UTC 2017 - luke.nukem.jones@gmail.com
- Adjust build so that aarch and ARM architectures use bootstrap for
initial build
-------------------------------------------------------------------
Tue Jan 31 04:25:06 UTC 2017 - luke.nukem.jones@gmail.com
- Fix provides/conflicts/obsoletes
-------------------------------------------------------------------
Fri Dec 23 08:22:26 UTC 2016 - luke.nukem.jones@gmail.com

34
rust.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package rust
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,27 +36,34 @@ BuildRequires: python
Recommends: cargo
#FIXME: currently there's no way to have rustc and rustc-beta installed
Conflicts: rust < %{version}
Conflicts: rustc <= %{version}
Conflicts: rustc-bootstrap <= %{version}
Obsoletes: rustc-1_9
Provides: rustc = %{version}
Provides: rustc-stable = %{version}
Conflicts: rustc-bootstrap
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
%if 0%{?suse_version}
BuildRequires: fdupes
%endif
%if %{with bootstrap}
%ifarch %{arm}
BuildRequires: rustc-bootstrap <= %{prev_version}
BuildRequires: rustc-bootstrap >= %{prev_version}
%else
%ifnarch armv7hl
%else
%ifarch aarch64
BuildRequires: rustc-bootstrap <= %{prev_version}
BuildRequires: rustc-bootstrap >= %{prev_version}
%else
%if %{with bootstrap}
BuildRequires: rustc-bootstrap <= %{prev_version}
BuildRequires: rustc-bootstrap >= %{prev_version}
%else
%if %{without bootstrap}
BuildRequires: rust <= %{version}
BuildRequires: rust >= %{prev_version}
%endif
%ifarch armv7hl
BuildRequires: rustc-bootstrap <= %{prev_version}
BuildRequires: rustc-bootstrap >= %{prev_version}
%endif
%endif
%endif
%endif
%endif
%description
@@ -105,9 +112,6 @@ export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
--prefix=%{_prefix} \
--release-channel=stable
make %{?_smp_mflags}
%if %{with bootstrap_tarball}
make %{?_smp_mflags} dist-tar-bins
%endif
%install
make %{?_smp_mflags} DESTDIR=%{buildroot} install