rpm/rust
SHA256
1
0
Fork 0
forked from pool/rust
Code Pull Requests Activity

Accepting request 502505 from home:luke_nukem:branches:devel:languages:rust

Browse Source 
Update to v1.18.0

OBS-URL: https://build.opensuse.org/request/show/502505
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=109
This commit is contained in:
Luke Jones
2017-06-09 08:26:16 +00:00
committed by Git OBS Bridge
parent 2c0d88b8e4
commit ef4d6663ef
5 changed files with 95 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rust.spec
View File

@@ -17,7 +17,7 @@
#
%global prev_rust 1.16.0
%global prev_rust 1.17.0
%global cargo_version 0.18.0
%global abi gnu
%ifarch s390x
@@ -46,7 +46,7 @@
%global dl_url https://static.rust-lang.org/dist
%bcond_with bootstrap
Name: rust
Version: 1.17.0
Version: 1.18.0
Release: 0
Summary: A systems programming language
License: MIT or Apache-2.0
@@ -150,25 +150,25 @@ invoking gdb on rust binaries.
%prep
%ifarch x86_64
%setup -q -T -b 100 -n cargo-%{cargo_version}-%{_arch}-unknown-linux-%{abi}
%setup -q -T -b 100 -n cargo-%{cargo_version}-%{rust_triple}
%endif
%ifarch %ix86
%setup -q -T -b 101 -n cargo-%{cargo_version}-i686-unknown-linux-%{abi}
%endif
%ifarch aarch64
%setup -q -T -b 102 -n cargo-%{cargo_version}-%{_arch}-unknown-linux-%{abi}
%setup -q -T -b 102 -n cargo-%{cargo_version}-%{rust_triple}
%endif
%ifarch armv7hl
%setup -q -T -b 103 -n cargo-%{cargo_version}-%{_arch}-unknown-linux-%{abi}
%setup -q -T -b 103 -n cargo-%{cargo_version}-%{rust_triple}
%endif
%ifarch ppc64
%setup -q -T -b 104 -n cargo-%{cargo_version}-%{_arch}-unknown-linux-%{abi}
%setup -q -T -b 104 -n cargo-%{cargo_version}-%{rust_triple}
%endif
%ifarch ppc64le
%setup -q -T -b 105 -n cargo-%{cargo_version}-%{_arch}-unknown-linux-%{abi}
%setup -q -T -b 105 -n cargo-%{cargo_version}-%{rust_triple}
%endif
%ifarch s390x
%setup -q -T -b 106 -n cargo-%{cargo_version}-%{_arch}-unknown-linux-%{abi}
%setup -q -T -b 106 -n cargo-%{cargo_version}-%{rust_triple}
%endif
# The cargo binary is only used to build rust and is not shipped
@@ -176,7 +176,7 @@ invoking gdb on rust binaries.
%ifarch %ix86
%global cargo_bin %{_builddir}/cargo-%{cargo_version}-i686-unknown-linux-%{abi}/cargo/bin/cargo
%else
%global cargo_bin %{_builddir}/cargo-%{cargo_version}-%{_arch}-unknown-linux-%{abi}/cargo/bin/cargo
%global cargo_bin %{_builddir}/cargo-%{cargo_version}-%{rust_triple}/cargo/bin/cargo
%endif
%setup -q -n rustc-%{version}-src
@@ -191,8 +191,8 @@ sed -e 's:<cargo-bin>:%{cargo_bin}:g' \
%build
export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
./x.py build -v
./x.py doc -v
./x.py build --config config.toml
./x.py doc --config config.toml
%install
sed -e 's:<cargo-bin>:%{cargo_bin}:g' \