Luke Jones 2018-11-05 14:17:50 +00:00 committed by Git OBS Bridge
parent ccd5187a84
commit a6a9ba3876

View File

@ -94,7 +94,7 @@ BuildRequires: pkgconfig(libssh2) >= 1.4.3
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
Recommends: %{name}-doc Recommends: %{name}-doc
Recommends: %{name}-std Recommends: %{name}-std-static
Recommends: cargo Recommends: cargo
Conflicts: rust Conflicts: rust
Conflicts: rustc-bootstrap Conflicts: rustc-bootstrap
@ -116,8 +116,8 @@ BuildRequires: cargo >= %{prev_rust}
BuildRequires: rust <= %{version} BuildRequires: rust <= %{version}
BuildRequires: rust >= %{prev_rust} BuildRequires: rust >= %{prev_rust}
# This must be bumped to rust-std-static after 1.27.2 is in mainstream # This must be bumped to rust-std-static after 1.27.2 is in mainstream
BuildRequires: rust-std <= %{version} BuildRequires: rust-std-static <= %{version}
BuildRequires: rust-std >= %{prev_rust} BuildRequires: rust-std-static >= %{prev_rust}
%endif %endif
%description %description
@ -341,7 +341,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
# Debuginfo can exhaust memory on these architecture workers # Debuginfo can exhaust memory on these architecture workers
%ifarch %{arm} %{ix86} %ifarch %{arm} %{ix86}
%define codegen_units --set codegen-units=4 %define codegen_units --set codegen-units=4
%define debug_info --disable-debuginfo --disable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines %define debug_info --disable-debuginfo --enable-debuginfo-only-std --disable-debuginfo-tools --disable-debuginfo-lines
%else %else
%define debug_info --enable-debuginfo --disable-debuginfo-only-std --enable-debuginfo-tools --disable-debuginfo-lines %define debug_info --enable-debuginfo --disable-debuginfo-only-std --enable-debuginfo-tools --disable-debuginfo-lines
%endif %endif