|
@@ -7,7 +7,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.42.0
|
|
|
+%global rustc_version 1.46.0
|
|
|
%global cargo_version %{rustc_version}
|
|
|
%global rustfmt_version %{rustc_version}
|
|
|
%global rls_version %{rustc_version}
|
|
@@ -25,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.42.0
|
|
|
-%global bootstrap_cargo 1.42.0
|
|
|
+%global bootstrap_rust 1.46.0
|
|
|
+%global bootstrap_cargo 1.46.0
|
|
|
%global bootstrap_channel %{bootstrap_rust}
|
|
|
|
|
|
# Only the specified arches will use bootstrap binaries.
|
|
@@ -54,17 +54,19 @@
|
|
|
%bcond_with lldb
|
|
|
%endif
|
|
|
|
|
|
+Summary: The Rust Programming Language
|
|
|
Name: rust
|
|
|
Version: %{rustc_version}
|
|
|
Release: 1%{?_dist_release}
|
|
|
-Summary: The Rust Programming Language
|
|
|
+Group: programming
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+
|
|
|
License: (ASL 2.0 or MIT) and (BSD and ISC and MIT)
|
|
|
# ^ written as: (rust itself) and (bundled libraries)
|
|
|
URL: https://www.rust-lang.org
|
|
|
-ExclusiveArch: %{rust_arches}
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
+ExclusiveArch: %{rust_arches}
|
|
|
|
|
|
%if "%{channel}" == "stable"
|
|
|
%global rustc_package rustc-%{version}-src
|
|
@@ -225,6 +227,7 @@ This package includes the Rust compiler and documentation generator.
|
|
|
|
|
|
%package std-static
|
|
|
Summary: Standard library for Rust
|
|
|
+Group: programming
|
|
|
|
|
|
%description std-static
|
|
|
This package includes the standard libraries for building applications
|
|
@@ -233,6 +236,7 @@ written in Rust.
|
|
|
|
|
|
%package debugger-common
|
|
|
Summary: Common debugger pretty printers for Rust
|
|
|
+Group: programming
|
|
|
BuildArch: noarch
|
|
|
|
|
|
%description debugger-common
|
|
@@ -241,6 +245,7 @@ This package includes the common functionality for %{name}-gdb and %{name}-lldb.
|
|
|
|
|
|
%package gdb
|
|
|
Summary: GDB pretty printers for Rust
|
|
|
+Group: programming
|
|
|
BuildArch: noarch
|
|
|
Requires: gdb
|
|
|
Requires: %{name}-debugger-common = %{version}-%{release}
|
|
@@ -254,12 +259,13 @@ programs.
|
|
|
|
|
|
%package lldb
|
|
|
Summary: LLDB pretty printers for Rust
|
|
|
+Group: programming
|
|
|
|
|
|
# It could be noarch, but lldb has limited availability
|
|
|
#BuildArch: noarch
|
|
|
|
|
|
Requires: lldb
|
|
|
-Requires: python-lldb
|
|
|
+Requires: python3-lldb
|
|
|
Requires: %{name}-debugger-common = %{version}-%{release}
|
|
|
|
|
|
%description lldb
|
|
@@ -271,6 +277,7 @@ programs.
|
|
|
|
|
|
%package doc
|
|
|
Summary: Documentation for Rust
|
|
|
+Group: documentation
|
|
|
# NOT BuildArch: noarch
|
|
|
# Note, while docs are mostly noarch, some things do vary by target_arch.
|
|
|
# Koji will fail the build in rpmdiff if two architectures build a noarch
|
|
@@ -284,6 +291,7 @@ its standard library.
|
|
|
%package -n cargo
|
|
|
Summary: Rust's package manager and build tool
|
|
|
Version: %{cargo_version}
|
|
|
+Group: programming
|
|
|
# For tests:
|
|
|
BuildRequires: git
|
|
|
# Cargo is not much use without Rust
|
|
@@ -297,6 +305,7 @@ and ensure that you'll always get a repeatable build.
|
|
|
%package -n cargo-doc
|
|
|
Summary: Documentation for Cargo
|
|
|
Version: %{cargo_version}
|
|
|
+Group: programming
|
|
|
BuildArch: noarch
|
|
|
# Cargo no longer builds its own documentation
|
|
|
# https://github.com/rust-lang/cargo/pull/4904
|
|
@@ -309,6 +318,7 @@ This package includes HTML documentation for Cargo.
|
|
|
%package -n rustfmt
|
|
|
Summary: Tool to find and fix Rust formatting issues
|
|
|
Version: %{rustfmt_version}
|
|
|
+Group: programming
|
|
|
Requires: cargo
|
|
|
Obsoletes: rustfmt-preview < 1.0.0
|
|
|
|
|
@@ -319,6 +329,7 @@ A tool for formatting Rust code according to style guidelines.
|
|
|
%package -n rls
|
|
|
Summary: Rust Language Server for IDE integration
|
|
|
Version: %{rls_version}
|
|
|
+Group: programming
|
|
|
Requires: rust-analysis
|
|
|
# /usr/bin/rls is dynamically linked against internal rustc libs
|
|
|
Requires: %{name} = %{rustc_version}-%{release}
|
|
@@ -334,6 +345,7 @@ reformatting, and code completion, and enables renaming and refactorings.
|
|
|
%package -n clippy
|
|
|
Summary: Lints to catch common mistakes and improve your Rust code
|
|
|
Version: %{clippy_version}
|
|
|
+Group: programming
|
|
|
License: MPLv2.0
|
|
|
Requires: cargo
|
|
|
# /usr/bin/clippy-driver is dynamically linked against internal rustc libs
|
|
@@ -346,6 +358,7 @@ A collection of lints to catch common mistakes and improve your Rust code.
|
|
|
|
|
|
%package src
|
|
|
Summary: Sources for the Rust standard library
|
|
|
+Group: programming
|
|
|
BuildArch: noarch
|
|
|
|
|
|
%description src
|
|
@@ -355,6 +368,7 @@ useful as a reference for code completion tools in various editors.
|
|
|
|
|
|
%package analysis
|
|
|
Summary: Compiler analysis data for the Rust standard library
|
|
|
+Group: programming
|
|
|
Requires: rust-std-static = %{rustc_version}-%{release}
|
|
|
|
|
|
%description analysis
|
|
@@ -367,7 +381,6 @@ data to provide information about the Rust standard library.
|
|
|
|
|
|
|
|
|
%prep
|
|
|
-
|
|
|
%ifarch %{bootstrap_arches}
|
|
|
%setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
|
|
|
./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
|
|
@@ -378,9 +391,7 @@ test -f '%{local_rust_root}/bin/rustc'
|
|
|
|
|
|
%setup -q -n %{rustc_package}
|
|
|
|
|
|
-%if "%{python}" == "python3"
|
|
|
sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
|
|
|
-%endif
|
|
|
|
|
|
%if %without bundled_llvm
|
|
|
rm -rf src/llvm-project/
|
|
@@ -431,7 +442,6 @@ find vendor -name .cargo-checksum.json \
|
|
|
|
|
|
|
|
|
%build
|
|
|
-
|
|
|
%if %{without bundled_libgit2}
|
|
|
export LIBGIT2_SYS_USE_PKG_CONFIG=1
|
|
|
%endif
|
|
@@ -464,7 +474,6 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
|
|
|
# workaround for https://github.com/rust-lang/rust/issues/69953
|
|
|
# --set rust.deny-warnings=false
|
|
|
|
|
|
-
|
|
|
%configure \
|
|
|
--disable-option-checking \
|
|
|
--libdir=%{common_libdir} \
|
|
@@ -585,11 +594,11 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
|
|
|
%endif
|
|
|
|
|
|
# The results are not stable on koji, so mask errors and just log it.
|
|
|
-%{__python} ./x.py test --no-fail-fast || :
|
|
|
-%{__python} ./x.py test --no-fail-fast cargo || :
|
|
|
-%{__python} ./x.py test --no-fail-fast clippy || :
|
|
|
-%{__python} ./x.py test --no-fail-fast rls || :
|
|
|
-%{__python} ./x.py test --no-fail-fast rustfmt || :
|
|
|
+%{__python3} ./x.py test --no-fail-fast || :
|
|
|
+%{__python3} ./x.py test --no-fail-fast cargo || :
|
|
|
+%{__python3} ./x.py test --no-fail-fast clippy || :
|
|
|
+%{__python3} ./x.py test --no-fail-fast rls || :
|
|
|
+%{__python3} ./x.py test --no-fail-fast rustfmt || :
|
|
|
%endif
|
|
|
|
|
|
|
|
@@ -612,33 +621,28 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
|
|
|
%{rustlibdir}/%{rust_triple}/lib/*.so
|
|
|
%exclude %{_bindir}/*miri
|
|
|
|
|
|
-
|
|
|
%files std-static
|
|
|
%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*
|
|
|
-
|
|
|
+%{rustlibdir}/etc/rust_types.py*
|
|
|
|
|
|
%files gdb
|
|
|
%{_bindir}/rust-gdb
|
|
|
%{rustlibdir}/etc/gdb_*.py*
|
|
|
%exclude %{_bindir}/rust-gdbgui
|
|
|
|
|
|
-
|
|
|
%if %with lldb
|
|
|
%files lldb
|
|
|
%{_bindir}/rust-lldb
|
|
|
%{rustlibdir}/etc/lldb_*.py*
|
|
|
%endif
|
|
|
|
|
|
-
|
|
|
%files doc
|
|
|
%docdir %{_docdir}/%{name}
|
|
|
%dir %{_docdir}/%{name}
|
|
@@ -651,11 +655,9 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
|
|
|
%{_docdir}/%{name}/html/*.png
|
|
|
%{_docdir}/%{name}/html/*.svg
|
|
|
%{_docdir}/%{name}/html/*.woff
|
|
|
-%{_docdir}/%{name}/html/SourceSerifPro-LICENSE.md
|
|
|
%license %{_docdir}/%{name}/html/*.txt
|
|
|
%license %{_docdir}/%{name}/html/*.md
|
|
|
|
|
|
-
|
|
|
%files -n cargo
|
|
|
%license src/tools/cargo/LICENSE-APACHE src/tools/cargo/LICENSE-MIT src/tools/cargo/LICENSE-THIRD-PARTY
|
|
|
%doc src/tools/cargo/README.md
|
|
@@ -669,42 +671,41 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
|
|
|
%dir %{_datadir}/cargo
|
|
|
%dir %{_datadir}/cargo/registry
|
|
|
|
|
|
-
|
|
|
%files -n cargo-doc
|
|
|
%docdir %{_docdir}/cargo
|
|
|
%dir %{_docdir}/cargo
|
|
|
%{_docdir}/cargo/html
|
|
|
|
|
|
-
|
|
|
%files -n rustfmt
|
|
|
%{_bindir}/rustfmt
|
|
|
%{_bindir}/cargo-fmt
|
|
|
%doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
|
|
|
%license src/tools/rustfmt/LICENSE-{APACHE,MIT}
|
|
|
|
|
|
-
|
|
|
%files -n rls
|
|
|
%{_bindir}/rls
|
|
|
%doc src/tools/rls/{README.md,COPYRIGHT,debugging.md}
|
|
|
%license src/tools/rls/LICENSE-{APACHE,MIT}
|
|
|
|
|
|
-
|
|
|
%files -n clippy
|
|
|
%{_bindir}/cargo-clippy
|
|
|
%{_bindir}/clippy-driver
|
|
|
%doc src/tools/clippy/{README.md,CHANGELOG.md}
|
|
|
%license src/tools/clippy/LICENSE*
|
|
|
|
|
|
-
|
|
|
%files src
|
|
|
%dir %{rustlibdir}
|
|
|
%{rustlibdir}/src
|
|
|
|
|
|
-
|
|
|
%files analysis
|
|
|
+%{_bindir}/rust-analyzer
|
|
|
%{rustlibdir}/%{rust_triple}/analysis/
|
|
|
|
|
|
+
|
|
|
%changelog
|
|
|
+* Thu Sep 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.46.0-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.42.0-1
|
|
|
- new upstream release.
|
|
|
- separated debuginfo.
|