# 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.54.0
-%define bootstrap_cargo 1.54.0
-%define bootstrap_date 2021-07-29
+%define bootstrap_rust 1.56.1
+%define bootstrap_cargo 1.56.1
+%define bootstrap_date 2021-11-01
%ifarch x32
%define with_cross 1
Summary: The Rust Programming Language
Summary(pl.UTF-8): Język programowania Rust
Name: rust
-Version: 1.55.0
-Release: 2
+Version: 1.57.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: bb05ec6801c08eb1353fa7316e02ee26
+# Source0-md5: 0c7d63d9c456c4ec0f95bb6bb729c13e
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 12cfee7377dafd0583fe53d7ed5d45fb
+# Source1-md5: 9c12561dff9debea38e4b93f881ae2bb
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: ec48712d83df42479eebca05bca06201
+# Source2-md5: 947bd95b9c8a9943d43af1bbabf1a8e1
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: b8c06e3435e8f37cfd8911273255019c
+# Source3-md5: 64d78bc0747c975fe0451e4fd5b8ac4b
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: ed4754c59f8476fa60e8266002b8f1ba
+# Source4-md5: a13652efd627b5e5f8bd278f378acea4
Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
-# Source5-md5: 9ceab67a2b1299a9314756280d90548b
+# Source5-md5: 3fb69008b1b0141d464a4a48317709b3
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
BuildRequires: curl
# 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.3.0
BuildRequires: libstdc++-devel
%if %{with system_llvm}
BuildRequires: llvm >= 10.0
# 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.3.0
BuildRequires: libstdc++-devel
%{?with_system_llvm:BuildRequires: llvm-devel >= 10.0}
BuildRequires: openssl-devel >= 1.0.1
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.3.0
+BuildRequires: libgit2-devel(x86-x32) >= 1.3.0
BuildRequires: libstdc++-multilib-64-devel
%if %{with system_llvm}
BuildRequires: llvm-devel(x86-64) >= 10.0
%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 }
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
-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 \
# 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 library/backtrace/crates/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace
+%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
%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
+)
+%dir %{rustlibdir}/%{rust_triple}/bin
+%attr(755,root,root) %{rustlibdir}/%{rust_triple}/bin/rust-llvm-dwp
%files debugger-common
%defattr(644,root,root,755)
projects / packages / rust.git / blobdiff