Correct rust-triples use in spec.
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/rust?expand=0&rev=38
This commit is contained in:
committed by
Git OBS Bridge
parent
b925753ed9
commit
fcd2e997b0
@@ -1,7 +1,7 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 6 08:36:44 UTC 2017 - luke.nukem.jones@gmail.com
|
||||
Mon Feb 6 09:05:39 UTC 2017 - luke.nukem.jones@gmail.com
|
||||
|
||||
- Remove rust-triples to rely on OBS
|
||||
- Correct rust-triples use in spec.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 6 08:25:17 UTC 2017 - luke.nukem.jones@gmail.com
|
||||
|
29
rust.spec
29
rust.spec
@@ -18,6 +18,24 @@
|
||||
|
||||
|
||||
%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
|
||||
%ifarch x86_64
|
||||
%global arch x86_64
|
||||
%endif
|
||||
%ifarch %{ix86}
|
||||
%global arch %{ix86}
|
||||
%endif
|
||||
%global rust_triple %{_arch}-unknown-linux-%{abi}
|
||||
%bcond_with bootstrap
|
||||
Name: rust
|
||||
Version: 1.15.0
|
||||
@@ -111,7 +129,10 @@ invoking gdb on rust binaries.
|
||||
%build
|
||||
export CPPFLAGS="%{optflags}" # eliminate complain from RPMlint
|
||||
# FIXME: you should use the %%configure macro
|
||||
./configure \
|
||||
%configure --disable-option-checking \
|
||||
--build=%{rust_triple}
|
||||
--host=%{rust_triple}
|
||||
--target=%{rust_triple} \
|
||||
--enable-local-rust \
|
||||
--local-rust-root=%{_prefix} \
|
||||
--prefix=%{_prefix} \
|
||||
@@ -171,9 +192,9 @@ sed -e '/*\//q' src/libbacktrace/backtrace.h \
|
||||
%files std
|
||||
%defattr(-,root,root)
|
||||
%dir %{_libdir}/rustlib
|
||||
%dir %{_libdir}/rustlib/*-unknown-linux-*
|
||||
%dir %{_libdir}/rustlib/*-unknown-linux-*/lib
|
||||
%{_libdir}/rustlib/*-unknown-linux-*/lib/*.rlib
|
||||
%dir %{_libdir}/rustlib/%{rust_triple}
|
||||
%dir %{_libdir}/rustlib/%{rust_triple}/lib
|
||||
%{_libdir}/rustlib/%{rust_triple}/lib/*.rlib
|
||||
|
||||
%files gdb
|
||||
%defattr(-,root,root,-)
|
||||
|
Reference in New Issue
Block a user