Correct the rust-triples by removing them for now. Rely on OBS
- Remove rust-triples to rely on OBS OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=37
This commit is contained in:
parent
a1ecdbb883
commit
b925753ed9
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 6 08:36:44 UTC 2017 - luke.nukem.jones@gmail.com
|
||||||
|
|
||||||
|
- Remove rust-triples to rely on OBS
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Feb 6 08:25:17 UTC 2017 - luke.nukem.jones@gmail.com
|
Mon Feb 6 08:25:17 UTC 2017 - luke.nukem.jones@gmail.com
|
||||||
|
|
||||||
|
23
rust.spec
23
rust.spec
@ -18,18 +18,6 @@
|
|||||||
|
|
||||||
|
|
||||||
%global prev_version 1.14.0
|
%global prev_version 1.14.0
|
||||||
%global abi gnu
|
|
||||||
%ifarch armv7hl
|
|
||||||
%global arch armv7
|
|
||||||
%global abi gnueabihf
|
|
||||||
%endif
|
|
||||||
%ifarch ppc64
|
|
||||||
%global arch powerpc64
|
|
||||||
%endif
|
|
||||||
%ifarch ppc64le
|
|
||||||
%global arch powerpc64le
|
|
||||||
%endif
|
|
||||||
%global rust_triple %{arch}-unknown-linux-%{abi}
|
|
||||||
%bcond_with bootstrap
|
%bcond_with bootstrap
|
||||||
Name: rust
|
Name: rust
|
||||||
Version: 1.15.0
|
Version: 1.15.0
|
||||||
@ -50,9 +38,9 @@ BuildRequires: gcc-c++
|
|||||||
BuildRequires: llvm-devel
|
BuildRequires: llvm-devel
|
||||||
BuildRequires: procps
|
BuildRequires: procps
|
||||||
BuildRequires: python
|
BuildRequires: python
|
||||||
|
Recommends: cargo
|
||||||
Recommends: %{name}-doc
|
Recommends: %{name}-doc
|
||||||
Recommends: %{name}-std
|
Recommends: %{name}-std
|
||||||
Recommends: cargo
|
|
||||||
Conflicts: rustc-bootstrap
|
Conflicts: rustc-bootstrap
|
||||||
Provides: rustc = %{version}
|
Provides: rustc = %{version}
|
||||||
Provides: rustc-stable = %{version}
|
Provides: rustc-stable = %{version}
|
||||||
@ -124,9 +112,6 @@ invoking gdb on rust binaries.
|
|||||||
export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
|
export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
|
||||||
# FIXME: you should use the %%configure macro
|
# FIXME: you should use the %%configure macro
|
||||||
./configure \
|
./configure \
|
||||||
--build=%{rust_triple} \
|
|
||||||
--host=%{rust_triple} \
|
|
||||||
--target=%{rust_triple} \
|
|
||||||
--enable-local-rust \
|
--enable-local-rust \
|
||||||
--local-rust-root=%{_prefix} \
|
--local-rust-root=%{_prefix} \
|
||||||
--prefix=%{_prefix} \
|
--prefix=%{_prefix} \
|
||||||
@ -186,9 +171,9 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \
|
|||||||
%files std
|
%files std
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%dir %{_libdir}/rustlib
|
%dir %{_libdir}/rustlib
|
||||||
%dir %{_libdir}/rustlib/%{rust_triple}
|
%dir %{_libdir}/rustlib/*-unknown-linux-*
|
||||||
%dir %{_libdir}/rustlib/%{rust_triple}/lib
|
%dir %{_libdir}/rustlib/*-unknown-linux-*/lib
|
||||||
%{_libdir}/rustlib/%{rust_triple}/lib/*.rlib
|
%{_libdir}/rustlib/*-unknown-linux-*/lib/*.rlib
|
||||||
|
|
||||||
%files gdb
|
%files gdb
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
Loading…
Reference in New Issue
Block a user