%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.47.0
-%define bootstrap_cargo 1.47.0
-%define bootstrap_date 2020-10-08
+%define bootstrap_rust 1.56.1
+%define bootstrap_cargo 1.56.1
+%define bootstrap_date 2021-11-01
%ifarch x32
%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.48.0
-Release: 0.1
+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: 1d8996bba1abbd5b3b149ccc89589664
+# Source0-md5: 0c7d63d9c456c4ec0f95bb6bb729c13e
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 9365de1153dae7bf1f99224382f8d77c
+# Source1-md5: 9c12561dff9debea38e4b93f881ae2bb
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: 9c351771a541e38416dd99ca85309059
+# Source2-md5: 947bd95b9c8a9943d43af1bbabf1a8e1
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 1bb96238b441204e2b47561857ca9916
+# Source3-md5: 64d78bc0747c975fe0451e4fd5b8ac4b
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: e178fcecb4bfdbacc967b76a5313c889
-Patch0: %{name}-x32.patch
+# Source4-md5: a13652efd627b5e5f8bd278f378acea4
+Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz
+# 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
+BuildRequires: libgit2-devel >= 1.3.0
BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel >= 8.0}
+%if %{with system_llvm}
+BuildRequires: llvm >= 10.0
+BuildRequires: llvm-devel >= 10.0
+%endif
BuildRequires: openssl-devel >= 1.0.1
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
BuildRequires: zlib-devel
%endif
%if %{without bootstrap}
BuildConflicts: %{name} > %{version}
%endif
%ifarch x32
-BuildRequires: glibc-devel(x32)
-BuildRequires: glibc-devel(x86_64)
+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
+BuildRequires: libgit2-devel >= 1.3.0
BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel >= 8.0}
+%{?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.3.0
+BuildRequires: libgit2-devel(x86-x32) >= 1.3.0
BuildRequires: libstdc++-multilib-64-devel
-# how to specify? - rpm.org adds arch provides on packages (__isa), uncomment once we switch
-#BuildRequires: curl-devel(x86-64)
-#BuildRequires: libgit2-devel(x86-64)
-#BuildRequires: llvm-devel(x86-64)>= 7.0
-#BuildRequires: openssl-devel(x86-64)
-#BuildRequires: zlib-devel(x86-64)
+%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/nightly/rustc/platform-support.html
%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}
+%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 }
zapobiegający naruszeniom ochrony pamięci i gwarantujący
bezpieczną wielowątkowość.
-%package analyzer
-Summary: Implementation of Language Server Protocol for Rust
-Summary(pl.UTF-8): Implementacja Language Server Protocol dla Rusta
+%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 analyzer
-Implementation of Language Server Protocol for Rust.
+%description std
+Standard library for Rust.
-%description analyzer -l pl.UTF-8
-Implementacja Language Server Protocol dla Rusta.
+%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
Group: Development/Debuggers
-%{?noarchpackage}
+BuildArch: noarch
%description debugger-common
This package includes the common functionality for rust-gdb and
Group: Development/Debuggers
Requires: %{name}-debugger-common = %{version}-%{release}
Requires: gdb
-%{?noarchpackage}
+BuildArch: noarch
%description gdb
This package includes the rust-gdb script, which allows easier
Group: Development/Debuggers
Requires: %{name}-debugger-common = %{version}-%{release}
Requires: lldb
-%{?noarchpackage}
+BuildArch: noarch
%description lldb
This package includes the rust-lldb script, which allows easier
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.
Summary: Documentation for Rust
Summary(pl.UTF-8): Dokumentacja do Rusta
Group: Documentation
-%{?noarchpackage}
+BuildArch: noarch
%description doc
This package includes HTML documentation for the Rust programming
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
%prep
%setup -q -n %{rustc_package}
-# irrelevant when not building rustc for x32
-%patch0 -p1
%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 \
# 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
+%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}/libchalk_derive-*.so
-%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
-%attr(755,root,root) %{_libdir}/libtracing_attributes-*.so
%{_mandir}/man1/rustc.1*
%{_mandir}/man1/rustdoc.1*
%dir %{rustlibdir}
-%dir %{rustlibdir}/%{rust_triple}
-%{rustlibdir}/%{rust_triple}/analysis
-%dir %{rustlibdir}/%{rust_triple}/lib
-%attr(755,root,root) %{rustlibdir}/%{rust_triple}/lib/*.so
-%{rustlibdir}/%{rust_triple}/lib/*.rlib
-%files analyzer
+%files analysis
+%defattr(644,root,root,755)
+%(for rust_target in %rust_targets; do
+echo "%{rustlibdir}/$rust_target/analysis"
+done
+)
+
+%files std
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rust-analyzer
+%(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)
%attr(755,root,root) %{_bindir}/cargo-clippy
%attr(755,root,root) %{_bindir}/cargo-fmt
%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