# 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
%bcond_with bootstrap # bootstrap using precompiled binaries
%bcond_with full_debuginfo # full debuginfo vs only std debuginfo (full takes gigabytes of memory to build)
%bcond_without system_llvm # system LLVM
-%bcond_without rustc # rustc building
-%bcond_without cargo # cargo building
%bcond_with tests # build without tests
# The channel can be stable, beta, or nightly
# 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
-%define bootstrap_rust 1.36.0
-%define bootstrap_cargo 0.37.0
-%define bootstrap_date 2019-07-04
+%define bootstrap_rust 1.54.0
+%define bootstrap_cargo 1.54.0
+%define bootstrap_date 2021-07-29
%ifarch x32
-%undefine with_cargo
-%undefine with_rustc
+%define with_cross 1
%endif
+
+%if %{without full_debuginfo}
+%define _enable_debug_packages 0
+%endif
+
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.37.0
+Version: 1.55.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.gz
-# Source0-md5: e67432b37150f13e186ebfb67e5192fb
-Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.gz
-# Source1-md5: 487d17bbb86891f58160ccf6f0347b49
-Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.gz
-# Source2-md5: 5f969ed3c9ef2a7e2a8011be7eb796c3
+Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz
+# Source0-md5: bb05ec6801c08eb1353fa7316e02ee26
+Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
+# Source1-md5: 12cfee7377dafd0583fe53d7ed5d45fb
+Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
+# Source2-md5: ec48712d83df42479eebca05bca06201
+Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
+# Source3-md5: b8c06e3435e8f37cfd8911273255019c
+Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
+# Source4-md5: ed4754c59f8476fa60e8266002b8f1ba
+Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
+# Source5-md5: 9ceab67a2b1299a9314756280d90548b
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
BuildRequires: curl
-BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel}
-BuildRequires: ncurses-devel
+# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
+BuildRequires: procps
BuildRequires: python >= 1:2.7
+BuildRequires: rpmbuild(macros) >= 1.752
+%if %{without cross}
+BuildRequires: curl-devel
+BuildRequires: libgit2-devel >= 1.1.0
+BuildRequires: libstdc++-devel
+%{?with_system_llvm:BuildRequires: llvm-devel >= 10.0}
+BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
BuildRequires: zlib-devel
+%endif
%if %{without bootstrap}
BuildRequires: %{name} >= %{bootstrap_rust}
BuildRequires: cargo >= %{bootstrap_cargo}
BuildConflicts: %{name} > %{version}
%endif
-# make check needs "ps" for src/test/run-pass/wait-forked-but-failed-child.rs
-BuildRequires: procps
+%ifarch x32
+BuildRequires: glibc-devel(x86-64)
+BuildRequires: glibc-devel(x86-x32)
+%if "%{_host_cpu}" == "x86_64"
+# building on x86_64 host with --target x32-pld-linux
+BuildRequires: curl-devel
+BuildRequires: gcc-multilib-x32
+BuildRequires: libgit2-devel >= 1.1.0
+BuildRequires: libstdc++-devel
+%{?with_system_llvm:BuildRequires: llvm-devel >= 10.0}
+BuildRequires: openssl-devel >= 1.0.1
+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: libstdc++-multilib-64-devel
+%if %{with system_llvm}
+BuildRequires: llvm-devel(x86-64) >= 10.0
+BuildRequires: llvm-devel(x86-x32) >= 10.0
+%endif
+BuildRequires: openssl-devel(x86-64)
+BuildRequires: openssl-devel(x86-x32)
+BuildRequires: zlib-devel(x86-64)
+BuildRequires: zlib-devel(x86-x32)
+%endif
+%endif
# The C compiler is needed at runtime just for linking. Someday rustc might
# invoke the linker directly, and then we'll only need binutils.
# https://github.com/rust-lang/rust/issues/11937
Requires: gcc
+Requires: %{name}-std%{?_isa} = %{version}-%{release}
+%ifarch x32
+Requires: %{name}-std(x86-64) = %{version}-%{release}
+%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/stable/book/getting-started.html#tier-1
-ExclusiveArch: %{x8664} %{ix86} x32
+# https://doc.rust-lang.org/nightly/rustc/platform-support.html
+ExclusiveArch: %{x8664} %{ix86} x32 aarch64 armv6hl armv7hl armv7hnl
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%ifarch x32
%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
+%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}
%else
%define rust_triple %{_target_cpu}-unknown-linux-gnu
-%define rust_bootstrap_triple %{_target_cpu}-unknown-linux-gnu
+%define rust_host_triple %{rust_triple}
+%define rust_bootstrap_triple %{rust_triple}
+%endif
+%endif
%endif
%if %{without bootstrap}
%define _noautoreqfiles lib.*-[[:xdigit:]]{8}[.]so.*
%define _noautoprovfiles lib.*-[[:xdigit:]]{8}[.]so.*
+%define x_py { \
+ x_py() { \
+ local cmd="$1"; \
+ shift; \
+ %{?__jobs:CARGO_BUILD_JOBS=%__jobs }./x.py "$cmd" %{?__jobs:-j %__jobs} "$@"; \
+ }; x_py }
+
+
%description
Rust is a systems programming language that runs blazingly fast,
prevents segfaults, and guarantees thread safety.
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
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+
+%description std
+Standard library for Rust.
+
+%description std -l pl.UTF-8
+Standardowa biblioteka 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
Summary: Rust's package manager and build tool
Summary(pl.UTF-8): Zarządca pakietów i narzędzie do budowania
Group: Development/Tools
-Requires: %{name}
+Requires: %{name}%{?_isa}
%description -n cargo
Cargo is a tool that allows Rust projects to declare their various
%ifarch %{ix86}
tar xf %{SOURCE2}
%endif
+%ifarch aarch64
+tar xf %{SOURCE3}
+%endif
+%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} \
# unbundle
# We're disabling jemalloc, but rust-src still wants it.
#%{__rm} -r src/jemalloc
-%{?with_system_llvm:%{__rm} -r src/llvm-project}
+%if %{with system_llvm}
+%{__rm} -r src/llvm-project
+mkdir -p src/llvm-project/libunwind
+%endif
# extract bundled licenses for packaging
-sed -e '/*\//q' vendor/backtrace-sys/src/libbacktrace/backtrace.h \
- >vendor/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
+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.
%build
%configure \
- --build=%{rust_triple} \
- --host=%{rust_triple} \
+ --build=%{rust_bootstrap_triple} \
+ --host=%{rust_host_triple} \
--target=%{rust_triple} \
--libdir=%{common_libdir} \
--disable-codegen-tests \
--llvm-root=%{_prefix} \
--release-channel=%{channel}
-RUST_BACKTRACE=full \
-./x.py dist --verbose
+export RUST_BACKTRACE=full
+%x_py dist --verbose
-%{?with_tests:./x.py test}
+%{?with_tests:%x_py test}
%install
rm -rf $RPM_BUILD_ROOT
-DESTDIR=$RPM_BUILD_ROOT ./x.py install
-DESTDIR=$RPM_BUILD_ROOT ./x.py install src
+export DESTDIR=$RPM_BUILD_ROOT
+%x_py install
# Make sure the shared libraries are in the proper libdir
%if "%{_libdir}" != "%{common_libdir}"
# 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 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
+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 vendor/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
-%attr(755,root,root) %{_bindir}/miri
-%attr(755,root,root) %{_bindir}/rls
+%doc COPYRIGHT LICENSE-APACHE LICENSE-MIT README.md library/backtrace/crates/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
%attr(755,root,root) %{_bindir}/rustc
%attr(755,root,root) %{_bindir}/rustdoc
%attr(755,root,root) %{_bindir}/rustfmt
-%attr(755,root,root) %{_libdir}/libarena-*.so
-%attr(755,root,root) %{_libdir}/libfmt_macros-*.so
-%attr(755,root,root) %{_libdir}/libgraphviz-*.so
-%attr(755,root,root) %{_libdir}/librustc*-*.so
-%attr(755,root,root) %{_libdir}/libserialize-*.so
+%attr(755,root,root) %{_libdir}/librustc_driver-*.so
%attr(755,root,root) %{_libdir}/libstd-*.so
-%attr(755,root,root) %{_libdir}/libsyntax-*.so
-%attr(755,root,root) %{_libdir}/libsyntax_ext-*.so
-%attr(755,root,root) %{_libdir}/libsyntax_pos-*.so
-%attr(755,root,root) %{_libdir}/libterm-*.so
%attr(755,root,root) %{_libdir}/libtest-*.so
%{_mandir}/man1/rustc.1*
%{_mandir}/man1/rustdoc.1*
%dir %{rustlibdir}
-%dir %{rustlibdir}/%{rust_triple}
+
+%files analysis
+%defattr(644,root,root,755)
%{rustlibdir}/%{rust_triple}/analysis
-%dir %{rustlibdir}/%{rust_triple}/codegen-backends
-%attr(755,root,root) %{rustlibdir}/%{rust_triple}/codegen-backends/*.so
+
+%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
%defattr(644,root,root,755)
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/etc
-%{_datadir}/%{name}/etc/debugger_*.py*
+%{_datadir}/%{name}/etc/lldb_commands
+%{_datadir}/%{name}/etc/rust_types.py
%files lldb
%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*
%dir %{_datadir}/cargo
%dir %{_datadir}/cargo/registry
projects / packages / rust.git / blobdiff