# 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.48.0
-%define bootstrap_cargo 1.48.0
-%define bootstrap_date 2020-11-19
+%define bootstrap_rust 1.51.0
+%define bootstrap_cargo 1.51.0
+%define bootstrap_date 2021-03-25
%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.49.0
-Release: 0.1
+Version: 1.52.1
+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: f13014e17f84a99ff749f81e0cd1d2b1
+# Source0-md5: 2df4835e3a15cc6f7e06fa4a986285d2
Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz
-# Source1-md5: 9aab1315df1f461bc988c5b5abcb8c89
+# Source1-md5: 7640d6538716c6492e56f361e3af0631
Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz
-# Source2-md5: 107dda909166a9c57d7907ac956eecd9
+# Source2-md5: 64f117dc1ae1543c8910eaa9a971ddd4
Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz
-# Source3-md5: 905c4ad9d3737fdf04c1acfd1b612b7c
+# Source3-md5: 3ac79872671df7ea0215fd351f52ffcf
Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz
-# Source4-md5: f8502775faa60c018e38eda59c43147e
-Patch0: %{name}-x32.patch
+# Source4-md5: f624772d7c7ba2e83a51b4e9c1657f7b
URL: https://www.rust-lang.org/
# for src/compiler-rt
BuildRequires: cmake >= 3.4.3
BuildRequires: rpmbuild(macros) >= 1.752
%if %{without cross}
BuildRequires: curl-devel
-BuildRequires: libgit2-devel
+BuildRequires: libgit2-devel >= 1.1.0
BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel >= 8.0}
+%{?with_system_llvm:BuildRequires: llvm-devel >= 9.0}
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.1.0
BuildRequires: libstdc++-devel
-%{?with_system_llvm:BuildRequires: llvm-devel >= 8.0}
+%{?with_system_llvm:BuildRequires: llvm-devel >= 9.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
-# 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) >= 9.0
+BuildRequires: llvm-devel(x86-x32) >= 9.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
# 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
%define rust_triple arm-unknown-linux-gnueabihf
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 analyzer
Summary: Implementation of Language Server Protocol for Rust
Summary(pl.UTF-8): Implementacja Language Server Protocol dla Rusta
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
# 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 '{}' '+'
%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}
+
+%files analysis
+%defattr(644,root,root,755)
%{rustlibdir}/%{rust_triple}/analysis
+
+%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
%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