# TODO
-# - unpackaged %{rustlibdir}/%{rust_triple}/bin/rust-llvm-dwp
# - consider a rust-std package containing .../rustlib/$target
# This might allow multilib cross-compilation to work naturally.
# - package additional tools
%define rustc_package rustc-%{channel}-src
%endif
-# To bootstrap from scratch, set the channel and date from src/stage0.txt
+# 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.55.0
-%define bootstrap_cargo 1.55.0
-%define bootstrap_date 2021-09-09
+%define bootstrap_rust 1.68.2
+%define bootstrap_cargo %{bootstrap_rust}
+%define bootstrap_date 2023-03-28
%ifarch x32
%define with_cross 1
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.56.0
+Version: 1.69.0
Release: 3
# 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: 3ad94ba9f05779800a5da6c02e00c444
+# Source0-md5: 2fac6c46422e743f5f05287e89e72f22
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 59b0a04436f96250a307086b6fc2ce34
+# Source1-md5: b82ae74e630a849d6675b93ddf0ed6ca
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: 693c87cf2fc1a41169f55fdbf8426a2e
+# Source2-md5: a2affbb1e831228c71f972a270717ce3
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 475f762804d4ad8695029a70f8b93a6d
+# Source3-md5: 489073dd8a8380c28a570bf70c9fbd6e
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: 56a568e97e7a5c3cb80569ab84f4657b
+# Source4-md5: bb43d3fca2893f2de0b892e0f4a8fdb3
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
-# Source5-md5: 991a439bcdcbcf1b2bbe55ce9e90404f
-Patch0: libgit2.patch
+# Source5-md5: 5691b194302d66b40c3e4eee0eeb1813
+Patch0: llvm-tools-install.patch
+Patch1: 111167.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: python >= 1:2.7
+BuildRequires: python3
+BuildRequires: python3-modules
+BuildRequires: rpm-build >= 4.6
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 >= 10.0
-BuildRequires: llvm-devel >= 10.0
+BuildRequires: llvm >= 14.0
+BuildRequires: llvm-devel >= 14.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 >= 10.0}
+%{?with_system_llvm:BuildRequires: llvm-devel >= 14.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) >= 10.0
-BuildRequires: llvm-devel(x86-x32) >= 10.0
+BuildRequires: llvm-devel(x86-64) >= 14.0
+BuildRequires: llvm-devel(x86-x32) >= 14.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
+Obsoletes: rust-analysis < 1.69.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
%define rust_triple armv7-unknown-linux-gnueabihf
%define rust_host_triple %{rust_triple}
%define rust_bootstrap_triple %{rust_triple}
+%define rust_suppl_targets thumbv7neon-unknown-linux-gnueabihf
%else
%define rust_triple %{_target_cpu}-unknown-linux-gnu
%define rust_host_triple %{rust_triple}
%endif
%endif
+%define rust_targets %rust_triple %{?rust_suppl_targets}
+
%if %{without bootstrap}
%define local_rust_root %{_prefix}
%else
x_py() { \
local cmd="$1"; \
shift; \
- %{?__jobs:CARGO_BUILD_JOBS=%__jobs }./x.py "$cmd" %{?__jobs:-j %__jobs} "$@"; \
+ %{?__jobs:CARGO_BUILD_JOBS=%__jobs }%{__python3} ./x.py "$cmd" %{?__jobs:-j %__jobs} "$@"; \
}; x_py }
zapobiegający naruszeniom ochrony pamięci i gwarantujący
bezpieczną wielowątkowość.
-%package analysis
-Summary: Metadata about the standard library
-Summary(pl.UTF-8): Metadane o standardowej bibliotece
-Group: Development/Tools
-Requires: %{name} = %{version}-%{release}
-
-%description analysis
-Metadata about the standard library.
-
-%description analysis -l pl.UTF-8
-Metadane o standardowej bibliotece.
-
%package std
Summary: Standard library for Rust
Summary(pl.UTF-8): Standardowa biblioteka Rusta
%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
+%patch1 -p1
%if %{with bootstrap}
%ifarch %{x8664} x32
-exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+'
%build
+export CC="%{__cc}"
+export CXX="%{__cxx}"
+export AR="%{__ar}"
%configure \
--build=%{rust_bootstrap_triple} \
--host=%{rust_host_triple} \
- --target=%{rust_triple} \
+ --target="%(echo %rust_targets | tr ' ' ,)" \
--libdir=%{common_libdir} \
--disable-codegen-tests \
--disable-debuginfo-lines \
--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
%install
rm -rf $RPM_BUILD_ROOT
+export CC="%{__cc}"
+export CXX="%{__cxx}"
+export AR="%{__ar}"
export DESTDIR=$RPM_BUILD_ROOT
%x_py install
# The libdir libraries are identical to those under rustlib/. It's easier on
# library loading if we keep them in libdir, but we do need them in rustlib/
# to support dynamic linking for compiler plugins, so we'll symlink.
-for l in libstd libtest ; do
- liblib=$RPM_BUILD_ROOT%{_libdir}/${l}-*.so
- libstd=$RPM_BUILD_ROOT%{rustlibdir}/%{rust_triple}/lib/${l}-*.so
- if [ "$(basename ${liblib})" = "$(basename ${libstd})" ]; then
- ln -vfsr ${libstd} $RPM_BUILD_ROOT%{_libdir}/
- fi
+for rust_target in %rust_targets; do
+ for l in libstd libtest ; do
+ liblib=$RPM_BUILD_ROOT%{_libdir}/${l}-*.so
+ libstd=$RPM_BUILD_ROOT%{rustlibdir}/${rust_target}/lib/${l}-*.so
+ if [ "$(basename ${liblib})" = "$(basename ${libstd})" ]; then
+ ln -vfsr ${libstd} $RPM_BUILD_ROOT%{_libdir}/
+ fi
+ done
done
# Remove installer artifacts (manifests, uninstall scripts, etc.)
%files
%defattr(644,root,root,755)
%doc COPYRIGHT LICENSE-APACHE LICENSE-MIT README.md
+%attr(755,root,root) %{_bindir}/rust-demangler
%attr(755,root,root) %{_bindir}/rustc
%attr(755,root,root) %{_bindir}/rustdoc
%attr(755,root,root) %{_bindir}/rustfmt
%{_mandir}/man1/rustdoc.1*
%dir %{rustlibdir}
-%files analysis
+%files std
%defattr(644,root,root,755)
-%{rustlibdir}/%{rust_triple}/analysis
+%(for rust_target in %rust_targets; do
+cat <<EOF
+%dir %{rustlibdir}/$rust_target
+%dir %{rustlibdir}/$rust_target/lib
+%attr(755,root,root) %{rustlibdir}/$rust_target/lib/*.so
+%{rustlibdir}/$rust_target/lib/*.rlib
+EOF
+done
+)
-%files std
+%files analyzer
%defattr(644,root,root,755)
-%dir %{rustlibdir}/%{rust_triple}
-%dir %{rustlibdir}/%{rust_triple}/lib
-%attr(755,root,root) %{rustlibdir}/%{rust_triple}/lib/*.so
-%{rustlibdir}/%{rust_triple}/lib/*.rlib
+%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}
projects / packages / rust.git / blobdiff