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 2
[-]
[+]
Changed
cross-armv7hl-rust.spec
@@ -1,9 +1,9 @@ # Combined rust / cross-{arch}-rust) specfile -Name: cross-armv7hl-rust +Name: rust # Keep Name on top ! -%global rustc_version 1.33.0 -%global cargo_version 1.33.0 +%global rustc_version 1.34.0 +%global cargo_version 1.34.0 %global rust_triple i686-unknown-linux-gnu %global rust_target arm-unknown-linux-gnueabihf @@ -34,7 +34,6 @@ BuildRequires: pkgconfig(zlib) BuildRequires: python BuildRequires: llvm-devel -BuildRequires: llvm-static BuildRequires: libffi-devel BuildRequires: cross-armv7hl-gcc BuildRequires: cross-armv7hl-binutils @@ -125,7 +124,7 @@ %patch1 -p1 %patch2 -p1 -# rm -rf src/llvm/ +rm -rf src/llvm/ rm -rf src/llvm-emscripten/ # We never enable other LLVM tools. @@ -141,7 +140,6 @@ %build export RUSTFLAGS="%{rustflags}" -export PATH="$PWD/cross_tools/:$PATH" # We're going to override --libdir when configuring to get rustlib into a # common path, but we'll fix the shared libraries during install. @@ -154,8 +152,10 @@ %configure --disable-option-checking \ --libdir=%{common_libdir} \ - --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_target} \ + --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \ --local-rust-root=%{local_rust_root} \ + --enable-local-rebuild \ + --enable-llvm-link-shared \ --enable-optimize \ --disable-rpath \ --disable-docs \ @@ -163,7 +163,8 @@ %{enable_debuginfo} \ --enable-vendor \ --enable-extended \ - --tools=cargo + --tools=cargo \ + --llvm-root=/usr/ python ./x.py build @@ -243,6 +244,7 @@ %files gdb %{_bindir}/rust-gdb +%{_bindir}/rust-gdbgui %{rustlibdir}/etc/gdb_*.py* @@ -262,6 +264,9 @@ %dir %{_datadir}/cargo/registry %changelog +* Fri Apr 12 2019 Lucien Xu <sfietkonstantin@free.fr> - 1.34.0-1 +- Package 1.34.0 + * Sat Mar 31 2019 Lucien Xu <sfietkonstantin@free.fr> - 1.33.0-1 - Package 1.33.0