# To bootstrap from scratch, set the channel and date from src/stage0.json
# e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
# or nightly wants some beta-YYYY-MM-DD
-%define bootstrap_rust 1.57.0
+%define bootstrap_rust 1.67.1
%define bootstrap_cargo %{bootstrap_rust}
-%define bootstrap_date 2021-12-02
+%define bootstrap_date 2023-02-09
%ifarch x32
%define with_cross 1
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.58.1
-Release: 3
+Version: 1.68.0
+Release: 1
# Licenses: (rust itself) and (bundled libraries)
License: (Apache v2.0 or MIT) and (BSD and ISC and MIT)
Group: Development/Languages
Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
-# Source0-md5: 835e82d659ea4fc19fd1f0888de01ad8
+# Source0-md5: e0c4908ceb01945930da218d172a21ba
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 0f58dba84eba1a5ab8ec51f52d95f453
+# Source1-md5: 800e693e0ac317755f8f0e19269540db
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: d75c7b995614c6ffa8df4409e64a13d6
+# Source2-md5: 65d86e2c17b1a09df55860a1d8dec9d4
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 7ba95696643b96b765b7ef5179cba8a4
+# Source3-md5: 127fdf3e824e23808a1fa6a8e92bcf56
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: 50ab0a0c6f4dc386e09616778e92a934
+# Source4-md5: 70acb1412ca21e288105d86a7d5b975b
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
-# Source5-md5: d79e80ff8677da71154b326f51ea39ee
+# Source5-md5: 1d917abdc484fd34c1471a931349a2c5
+Patch0: llvm-tools-install.patch
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
BuildRequires: curl
+%ifarch %{arm} %{mips32} %{ppc}
+BuildRequires: libatomic-devel
+%endif
# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
BuildRequires: procps
BuildRequires: python3
BuildRequires: rpmbuild(macros) >= 1.752
%if %{without cross}
BuildRequires: curl-devel
-BuildRequires: libgit2-devel >= 1.3.0
+BuildRequires: libgit2-devel >= 1.4.0
BuildRequires: libstdc++-devel
%if %{with system_llvm}
-BuildRequires: llvm >= 12.0
-BuildRequires: llvm-devel >= 12.0
+BuildRequires: llvm >= 13.0
+BuildRequires: llvm-devel >= 13.0
%endif
BuildRequires: openssl-devel >= 1.0.1
BuildRequires: tar >= 1:1.22
BuildRequires: xz
+BuildRequires: xz-devel
BuildRequires: zlib-devel
%endif
%if %{without bootstrap}
# building on x86_64 host with --target x32-pld-linux
BuildRequires: curl-devel
BuildRequires: gcc-multilib-x32
-BuildRequires: libgit2-devel >= 1.3.0
+BuildRequires: libgit2-devel >= 1.4.0
BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel >= 12.0}
+%{?with_system_llvm:BuildRequires: llvm-devel >= 13.0}
BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: xz-devel
BuildRequires: zlib-devel
%else
# building x86_64-hosted crosscompiler on x32 host
BuildRequires: curl-devel(x86-64)
BuildRequires: curl-devel(x86-x32)
BuildRequires: gcc-multilib-64
-BuildRequires: libgit2-devel(x86-64) >= 1.3.0
-BuildRequires: libgit2-devel(x86-x32) >= 1.3.0
+BuildRequires: libgit2-devel(x86-64) >= 1.4.0
+BuildRequires: libgit2-devel(x86-x32) >= 1.4.0
BuildRequires: libstdc++-multilib-64-devel
%if %{with system_llvm}
-BuildRequires: llvm-devel(x86-64) >= 12.0
-BuildRequires: llvm-devel(x86-x32) >= 12.0
+BuildRequires: llvm-devel(x86-64) >= 13.0
+BuildRequires: llvm-devel(x86-x32) >= 13.0
%endif
BuildRequires: openssl-devel(x86-64)
BuildRequires: openssl-devel(x86-x32)
+BuildRequires: xz-devel(x86-64)
+BuildRequires: xz-devel(x86-x32)
BuildRequires: zlib-devel(x86-64)
BuildRequires: zlib-devel(x86-x32)
%endif
Requires: %{name}-std%{?_isa} = %{version}-%{release}
%ifarch x32
Requires: %{name}-std(x86-64) = %{version}-%{release}
+Requires: gcc-multilib-64
%endif
-Obsoletes: rust-analyzer < 1.53.0
# Only x86_64 and i686 are Tier 1 platforms at this time.
# x32 is Tier 2, only rust-std is available (no rustc or cargo).
# https://doc.rust-lang.org/nightly/rustc/platform-support.html
%description std -l pl.UTF-8
Standardowa biblioteka Rusta.
+%package analyzer
+Summary: Implementation of Language Server Protocol for Rust
+Summary(pl.UTF-8): Implementacja Language Server Protocol dla Rusta
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+Obsoletes: rust-rls < 1.65.0
+
+%description analyzer
+Implementation of Language Server Protocol for Rust.
+
+%description analyzer -l pl.UTF-8
+Implementacja Language Server Protocol dla Rusta.
+
%package debugger-common
Summary: Common debugger pretty printers for Rust
Summary(pl.UTF-8): Narzędzia wypisujące struktury Rusa wspólne dla różnych debuggerów
Ten pakiet zawiera skrypt rust-lldb, pozwalający na łatwiejsze
odpluskwianie programów w języku Rust.
-%package rls
-Summary: Rust Language Server for IDE integration
-Summary(pl.UTF-8): Rust Language Server do integracji z IDE
-Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-analysis = %{version}-%{release}
-
-%description rls
-Rust Language Server for IDE integration.
-
-%description rls -l pl.UTF-8
-Rust Language Server do integracji z IDE.
-
%package doc
Summary: Documentation for Rust
Summary(pl.UTF-8): Dokumentacja do Rusta
Group: Applications/Shells
Requires: %{name} = %{version}-%{release}
Requires: bash-completion
+BuildArch: noarch
%description -n bash-completion-cargo
Bash completion for cargo command.
Group: Applications/Shells
Requires: %{name} = %{version}-%{release}
Requires: zsh
+BuildArch: noarch
%description -n zsh-completion-cargo
Zsh completion for cargo command.
%prep
%setup -q -n %{rustc_package}
+%patch0 -p1 -R
%if %{with bootstrap}
%ifarch %{x8664} x32
--enable-vendor \
--local-rust-root=%{local_rust_root} \
--llvm-root=%{_prefix} \
- --release-channel=%{channel}
+ --release-channel=%{channel} \
+ --set=llvm.static-libstdcpp=false
export RUST_BACKTRACE=full
%x_py dist --verbose
EOF
done
)
-%ifnarch x32
-%dir %{rustlibdir}/%{rust_triple}/bin
-%attr(755,root,root) %{rustlibdir}/%{rust_triple}/bin/rust-llvm-dwp
-%endif
+
+%files analyzer
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rust-analyzer
+%attr(755,root,root) %{_libexecdir}/rust-analyzer-proc-macro-srv
%files debugger-common
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/rust-gdbgui
%{_datadir}/%{name}/etc/gdb_*.py*
-%files rls
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rls
-
%files doc
%defattr(644,root,root,755)
%dir %{_docdir}/%{name}