%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.51.0
-%define bootstrap_cargo 1.51.0
-%define bootstrap_date 2021-03-25
+%define bootstrap_rust 1.67.1
+%define bootstrap_cargo %{bootstrap_rust}
+%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.52.1
+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: 2df4835e3a15cc6f7e06fa4a986285d2
+# Source0-md5: e0c4908ceb01945930da218d172a21ba
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 7640d6538716c6492e56f361e3af0631
+# Source1-md5: 800e693e0ac317755f8f0e19269540db
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: 64f117dc1ae1543c8910eaa9a971ddd4
+# Source2-md5: 65d86e2c17b1a09df55860a1d8dec9d4
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 3ac79872671df7ea0215fd351f52ffcf
+# Source3-md5: 127fdf3e824e23808a1fa6a8e92bcf56
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: f624772d7c7ba2e83a51b4e9c1657f7b
-Patch0: %{name}-x32.patch
+# Source4-md5: 70acb1412ca21e288105d86a7d5b975b
+Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
+# 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: 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.1.0
+BuildRequires: libgit2-devel >= 1.4.0
BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel >= 9.0}
+%if %{with system_llvm}
+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.1.0
+BuildRequires: libgit2-devel >= 1.4.0
BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel >= 9.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.1.0
-BuildRequires: libgit2-devel(x86-x32) >= 1.1.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) >= 9.0
-BuildRequires: llvm-devel(x86-x32) >= 9.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
# 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).
%define rust_triple x86_64-unknown-linux-gnux32
%define rust_host_triple x86_64-unknown-linux-gnu
%define rust_bootstrap_triple x86_64-unknown-linux-gnu
+# libs in _libdir are x86_64 64bit
+%define _lib lib64
+%define _libdir %{_prefix}/lib64
%else
-%ifarch armv6hl armv7hl armv7hnl
+%ifarch armv6hl
%define rust_triple arm-unknown-linux-gnueabihf
%define rust_host_triple %{rust_triple}
%define rust_bootstrap_triple %{rust_triple}
%else
+%ifarch armv7hl armv7hnl
+%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}
%define rust_bootstrap_triple %{rust_triple}
%endif
%endif
+%endif
+
+%define rust_targets %rust_triple %{?rust_suppl_targets}
%if %{without bootstrap}
%define local_rust_root %{_prefix}
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 }
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.
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.
%prep
%setup -q -n %{rustc_package}
-# irrelevant when not building rustc for x32
-#%%patch0 -p1
+%patch0 -p1 -R
%if %{with bootstrap}
%ifarch %{x8664} x32
%ifarch aarch64
tar xf %{SOURCE3}
%endif
-%ifarch armv6hl armv7hl armv7hnl
+%ifarch armv6hl
tar xf %{SOURCE4}
%endif
+%ifarch armv7hl armv7hnl
+tar xf %{SOURCE5}
+%endif
%{__mv} %{bootstrap_root} %{bootstrap_root}-root
%{bootstrap_root}-root/install.sh \
--components=cargo,rustc,rust-std-%{rust_bootstrap_triple} \
mkdir -p src/llvm-project/libunwind
%endif
-# extract bundled licenses for packaging
-sed -e '/*\//q' library/backtrace/crates/backtrace-sys/src/libbacktrace/backtrace.h \
- >library/backtrace/crates/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
-
# rust-gdb has hardcoded SYSROOT/lib -- let's make it noarch
sed -i -e 's#DIRECTORY=".*"#DIRECTORY="%{_datadir}/%{name}/etc"#' \
src/etc/rust-gdb
+# cargo has hardcoded libexec path - honour rpm _libexecdir
+%if "%{_libexecdir}" != "%{_prefix}/libexec"
+suffix="%(echo "%{_libexecdir}" | %{__sed} -e 's,^%{_prefix}/,,')"
+%{__sed} -i -e 's,"libexec","'${suffix}'",' \
+ src/bootstrap/dist.rs \
+ src/tools/cargo/src/cargo/ops/registry/auth.rs
+%{__sed} -i -e 's,libexec/,'${suffix}'/,' src/tools/cargo/tests/testsuite/credential_process.rs
+%endif
+
# The configure macro will modify some autoconf-related files, which upsets
# cargo when it tries to verify checksums in those files. If we just truncate
# that file list, cargo won't have anything to complain about.
-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.
-(cd "$RPM_BUILD_ROOT%{rustlibdir}/%{rust_triple}/lib" &&
- find ../../../../%{_lib} -maxdepth 1 -name '*.so' \
- -exec ln -v -f -s -t . '{}' '+')
+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.)
find $RPM_BUILD_ROOT%{rustlibdir}/ -maxdepth 1 -type f -exec rm -v '{}' '+'
%files
%defattr(644,root,root,755)
-%doc COPYRIGHT LICENSE-APACHE LICENSE-MIT README.md library/backtrace/crates/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
-%attr(755,root,root) %{_bindir}/miri
+%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
-%attr(755,root,root) %{_libdir}/librustc*-*.so
+%attr(755,root,root) %{_libdir}/librustc_driver-*.so
%attr(755,root,root) %{_libdir}/libstd-*.so
%attr(755,root,root) %{_libdir}/libtest-*.so
%{_mandir}/man1/rustc.1*
%files analysis
%defattr(644,root,root,755)
-%{rustlibdir}/%{rust_triple}/analysis
+%(for rust_target in %rust_targets; do
+echo "%{rustlibdir}/$rust_target/analysis"
+done
+)
%files std
%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
+%(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 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}
%attr(755,root,root) %{_bindir}/cargo
%attr(755,root,root) %{_bindir}/cargo-clippy
%attr(755,root,root) %{_bindir}/cargo-fmt
-%attr(755,root,root) %{_bindir}/cargo-miri
%attr(755,root,root) %{_bindir}/clippy-driver
%attr(755,root,root) %{_libexecdir}/cargo-credential-1password
%{_mandir}/man1/cargo*.1*