|
@@ -1,6 +1,7 @@
|
|
|
%bcond_with bootstrap
|
|
|
%bcond_with test
|
|
|
%bcond_with newrpm
|
|
|
+%bcond_with miri
|
|
|
%bcond_without clang
|
|
|
%bcond_without bundled_libgit2
|
|
|
%bcond_without bundled_libssh2
|
|
@@ -8,7 +9,7 @@
|
|
|
# Some sub-packages are versioned independently of the rust compiler and runtime itself.
|
|
|
# Also beware that if any of these are not changed in a version bump, then the release
|
|
|
# number should still increase, not be reset to 1!
|
|
|
-%global rustc_version 1.52.1
|
|
|
+%global rustc_version 1.53.0
|
|
|
%global cargo_version %{rustc_version}
|
|
|
%global rustfmt_version %{rustc_version}
|
|
|
%global rls_version %{rustc_version}
|
|
@@ -24,8 +25,8 @@
|
|
|
# To bootstrap from scratch, set the channel and date from src/stage0.txt
|
|
|
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
|
|
|
# or nightly wants some beta-YYYY-MM-DD
|
|
|
-%global bootstrap_rust 1.52.0
|
|
|
-%global bootstrap_cargo 1.52.0
|
|
|
+%global bootstrap_rust 1.52.1
|
|
|
+%global bootstrap_cargo 1.52.1
|
|
|
%global bootstrap_channel %{bootstrap_rust}
|
|
|
|
|
|
# Only the specified arches will use bootstrap binaries.
|
|
@@ -182,6 +183,10 @@ Provides: bundled(miniz) = 1.14
|
|
|
Provides: rustc = %{version}-%{release}
|
|
|
Provides: rustc%{?_isa} = %{version}-%{release}
|
|
|
|
|
|
+%if ! %{with miri}
|
|
|
+Obsoletes: rust-miri < %{version}-%{release}
|
|
|
+%endif
|
|
|
+
|
|
|
# Always require our exact standard library
|
|
|
Requires: %{name}-std-static%{?_isa} = %{version}-%{release}
|
|
|
|
|
@@ -380,6 +385,8 @@ This package contains analysis data files produced with rustc's -Zsave-analysis
|
|
|
feature for the Rust standard library. The RLS (Rust Language Server) uses this
|
|
|
data to provide information about the Rust standard library.
|
|
|
|
|
|
+
|
|
|
+%if %{with miri}
|
|
|
%package miri
|
|
|
Summary: An interpreter for Rust's mid-level intermediate representation
|
|
|
Group: programming
|
|
@@ -389,13 +396,22 @@ Requires: rust = %{rustc_version}-%{release}
|
|
|
An experimental interpreter for Rust's mid-level intermediate representation
|
|
|
(MIR). It can run binaries and test suites of cargo projects and detect certain
|
|
|
classes of undefined behavior.
|
|
|
+%endif
|
|
|
|
|
|
|
|
|
%if %{with newrpm}
|
|
|
# debuginfo is available on x86_64 only
|
|
|
%ifarch x86_64
|
|
|
%debug_package
|
|
|
+%else
|
|
|
+%global _build_id_links none
|
|
|
+%global __debug_install_post %{nil}
|
|
|
+%global debug_package %{nil}
|
|
|
%endif
|
|
|
+%else
|
|
|
+%global _build_id_links none
|
|
|
+%global __debug_install_post %{nil}
|
|
|
+%global debug_package %{nil}
|
|
|
%endif
|
|
|
|
|
|
|
|
@@ -525,6 +541,7 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
|
|
|
--set rust.codegen-units-std=1 \
|
|
|
--release-channel=%{channel} \
|
|
|
--set rust.deny-warnings=false \
|
|
|
+ --tools=analysis,cargo,clippy,rls,rustfmt,src \
|
|
|
%{nil}
|
|
|
|
|
|
RUST_BACKTRACE=1 %{__python3} ./x.py build -j "$ncpus" --stage 2
|
|
@@ -735,15 +752,19 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
|
|
|
%{rustlibdir}/src
|
|
|
|
|
|
%files analysis
|
|
|
-%{_bindir}/rust-analyzer
|
|
|
%{rustlibdir}/%{rust_triple}/analysis/
|
|
|
|
|
|
+%if %{with miri}
|
|
|
%files miri
|
|
|
%{_bindir}/miri
|
|
|
%{_bindir}/cargo-miri
|
|
|
-
|
|
|
+%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Jun 21 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.53.0-1
|
|
|
+- new upstream release.
|
|
|
+- dropped a package: rust-miri.
|
|
|
+
|
|
|
* Sun Jun 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.52.1-1
|
|
|
- new upstream release.
|
|
|
|