Search
SailfishOS Open Build Service
>
Projects
>
home:sfietkonstantin
:
devel
>
cross-armv7hl-rust
> Changes
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
Changes of Revision 5
[-]
[+]
Changed
cross-armv7hl-rust.spec
@@ -42,11 +42,11 @@ Requires: /usr/bin/cc # ALL Rust libraries are private, because they don't keep an ABI. -%global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.* -%global __provides_exclude ^(%{_privatelibs})$ -%global __requires_exclude ^(%{_privatelibs})$ -%global __provides_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ -%global __requires_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ +# %global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.* +# %global __provides_exclude ^(%{_privatelibs})$ +# %global __requires_exclude ^(%{_privatelibs})$ +# %global __provides_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ +# %global __requires_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ # While we don't want to encourage dynamic linking to Rust shared libraries, as # there's no stable ABI, we still need the unallocated metadata (.rustc) to @@ -134,8 +134,8 @@ # We're going to override --libdir when configuring to get rustlib into a # common path, but we'll fix the shared libraries during install. -%global common_libdir %{_prefix}/lib -%global rustlibdir %{common_libdir}/rustlib +# %global common_libdir /opt/cross/lib +# %global rustlibdir %{common_libdir}/rustlib # full debuginfo is exhausting memory; just do libstd for now # https://github.com/rust-lang/rust/issues/45854 @@ -161,29 +161,7 @@ %install export RUSTFLAGS="%{rustflags}" -DESTDIR=%{buildroot} python ./x.py install - -# Make sure the shared libraries are in the proper libdir -%if "%{_libdir}" != "%{common_libdir}" -mkdir -p %{buildroot}%{_libdir} -find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \ - -exec mv -v -t %{buildroot}%{_libdir} '{}' '+' -%endif - -# The shared libraries should be executable for debuginfo extraction. -find %{buildroot}%{_libdir} -maxdepth 1 -type f -name '*.so' \ - -exec chmod -v +x '{}' '+' - -# The libdir libraries are identical to those under rustlib/. It's easier on -# library loading if we keep them in libdir, but we do need them in rustlib/ -# to support dynamic linking for compiler plugins, so we'll symlink. -(cd "%{buildroot}%{rustlibdir}/%{rust_triple}/lib" && - find ../../../../%{_lib} -maxdepth 1 -name '*.so' | - while read lib; do - # make sure they're actually identical! - cmp "$lib" "${lib##*/}" - ln -v -f -s -t . "$lib" - done) +DESTDIR=%{buildroot}/opt/cross python ./x.py install # Remove installer artifacts (manifests, uninstall scripts, etc.) find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+' @@ -201,42 +179,42 @@ rm -f %{buildroot}%{_docdir}/%{name}/*.old %files -%license COPYRIGHT LICENSE-APACHE LICENSE-MIT -%doc README.md -%{_bindir}/rustc -%{_bindir}/rustdoc -%{_libdir}/*.so -%{_mandir}/man1/rustc.1* -%{_mandir}/man1/rustdoc.1* -%dir %{rustlibdir} -%dir %{rustlibdir}/%{rust_triple} -%dir %{rustlibdir}/%{rust_triple}/lib -%{rustlibdir}/%{rust_triple}/lib/*.so -%{rustlibdir}/%{rust_triple}/codegen-backends/ +# %license COPYRIGHT LICENSE-APACHE LICENSE-MIT +# %doc README.md +# %{_bindir}/rustc +# %{_bindir}/rustdoc +# %{_libdir}/*.so +# %{_mandir}/man1/rustc.1* +# %{_mandir}/man1/rustdoc.1* +# %dir %{rustlibdir} +# %dir %{rustlibdir}/%{rust_triple} +# %dir %{rustlibdir}/%{rust_triple}/lib +# %{rustlibdir}/%{rust_triple}/lib/*.so +# %{rustlibdir}/%{rust_triple}/codegen-backends/ %files std-static -%dir %{rustlibdir} -%dir %{rustlibdir}/%{rust_triple} -%dir %{rustlibdir}/%{rust_triple}/lib -%{rustlibdir}/%{rust_triple}/lib/*.rlib +# %dir %{rustlibdir} +# %dir %{rustlibdir}/%{rust_triple} +# %dir %{rustlibdir}/%{rust_triple}/lib +# %{rustlibdir}/%{rust_triple}/lib/*.rlib %files debugger-common -%dir %{rustlibdir} -%dir %{rustlibdir}/etc -%{rustlibdir}/etc/debugger_*.py* +# %dir %{rustlibdir} +# %dir %{rustlibdir}/etc +# %{rustlibdir}/etc/debugger_*.py* %files gdb -%{_bindir}/rust-gdb -%{_bindir}/rust-gdbgui -%{rustlibdir}/etc/gdb_*.py* +# %{_bindir}/rust-gdb +# %{_bindir}/rust-gdbgui +# %{rustlibdir}/etc/gdb_*.py* %files lldb -%{_bindir}/rust-lldb -%{rustlibdir}/etc/lldb_*.py* +# %{_bindir}/rust-lldb +# %{rustlibdir}/etc/lldb_*.py* %changelog