X-Git-Url: http://git.pld-linux.org/gitweb.cgi?p=packages%2Frust.git;a=blobdiff_plain;f=rust.spec;h=1d495f1fe377cfa46fe04127d73f4b909ccdebbf;hp=0a6380dbeb7d41a50c8eb263d64915cd876f2f4b;hb=62473c9552f86f55f6f591df14ca1755ecdb5cd6;hpb=7da6653dd8ab13da223f0cd3f0aec068dc140669 diff --git a/rust.spec b/rust.spec index 0a6380d..1d495f1 100644 --- a/rust.spec +++ b/rust.spec @@ -7,8 +7,6 @@ %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 @@ -20,66 +18,140 @@ %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.40.0 -%define bootstrap_cargo 1.40.0 -%define bootstrap_date 2019-12-19 +%define bootstrap_rust 1.56.1 +%define bootstrap_cargo 1.56.1 +%define bootstrap_date 2021-11-01 %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.41.0 +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: e8c9d1d39ceb0dd43ee0100d0f019da4 +# Source0-md5: 0c7d63d9c456c4ec0f95bb6bb729c13e Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz -# Source1-md5: db6b86d8f11fcc95a204e0e8bac5f2a0 +# Source1-md5: 9c12561dff9debea38e4b93f881ae2bb Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz -# Source2-md5: 6adca51ae634e6bcd6b403fd554c4cb2 -Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-std-%{bootstrap_rust}-x86_64-unknown-linux-gnux32.tar.xz -# Source3-md5: d0183d3eb143de574fa349d10e821730 +# Source2-md5: 947bd95b9c8a9943d43af1bbabf1a8e1 +Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz +# Source3-md5: 64d78bc0747c975fe0451e4fd5b8ac4b +Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz +# 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: python3 +BuildRequires: python3-modules +BuildRequires: rpm-build >= 4.6 +BuildRequires: rpmbuild(macros) >= 1.752 +%if %{without cross} +BuildRequires: curl-devel +BuildRequires: libgit2-devel >= 1.3.0 BuildRequires: libstdc++-devel -%{?with_system_llvm:BuildRequires: llvm-devel >= 7.0} +%if %{with system_llvm} +BuildRequires: llvm >= 10.0 +BuildRequires: llvm-devel >= 10.0 +%endif BuildRequires: openssl-devel >= 1.0.1 -BuildRequires: python >= 1:2.7 +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.3.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.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 +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 + +%define rust_targets %rust_triple %{?rust_suppl_targets} %if %{without bootstrap} %define local_rust_root %{_prefix} @@ -102,6 +174,14 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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 }%{__python3} ./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. @@ -114,6 +194,30 @@ Rust to systemowy język programowania działający bardzo szybko, 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 @@ -159,6 +263,19 @@ debugging of Rust programs. 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 @@ -177,7 +294,7 @@ programowania Rust i jego biblioteki standardowej. 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 @@ -217,18 +334,20 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh. %setup -q -n %{rustc_package} %if %{with bootstrap} -%ifarch %{x8664} +%ifarch %{x8664} x32 tar xf %{SOURCE1} %endif %ifarch %{ix86} tar xf %{SOURCE2} %endif -%ifarch x32 -tar xf %{SOURCE1} -cd %{bootstrap_root} +%ifarch aarch64 tar xf %{SOURCE3} -%{__mv} rust-std-%{bootstrap_rust}-%{rust_triple} rust-std-%{rust_triple} -cd .. +%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 \ @@ -237,27 +356,29 @@ cd .. --disable-ldconfig test -f %{local_rust_root}/bin/cargo test -f %{local_rust_root}/bin/rustc -%ifarch x32 -%{bootstrap_root}-root/rust-std-%{rust_triple}/install.sh \ - --components=rust-std-%{rust_triple} \ - --prefix=%{local_rust_root} \ - --disable-ldconfig -%endif %endif # unbundle # We're disabling jemalloc, but rust-src still wants it. #%{__rm} -r src/jemalloc -%{?with_system_llvm:%{__rm} -r src/llvm-project} - -# extract bundled licenses for packaging -sed -e '/*\//q' vendor/backtrace-sys/src/libbacktrace/backtrace.h \ - >vendor/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace +%if %{with system_llvm} +%{__rm} -r src/llvm-project +mkdir -p src/llvm-project/libunwind +%endif # 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. @@ -265,10 +386,13 @@ find vendor -name .cargo-checksum.json \ -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+' %build +export CC="%{__cc}" +export CXX="%{__cxx}" +export AR="%{__ar}" %configure \ - --build=%{rust_triple} \ - --host=%{rust_triple} \ - --target=%{rust_triple} \ + --build=%{rust_bootstrap_triple} \ + --host=%{rust_host_triple} \ + --target="%(echo %rust_targets | tr ' ' ,)" \ --libdir=%{common_libdir} \ --disable-codegen-tests \ --disable-debuginfo-lines \ @@ -289,16 +413,16 @@ find vendor -name .cargo-checksum.json \ --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}" @@ -313,9 +437,15 @@ find $RPM_BUILD_ROOT%{_libdir}/ -type f -name '*.so' -exec chmod -v +x '{}' '+' # 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 '{}' '+' @@ -351,29 +481,45 @@ rm -rf $RPM_BUILD_ROOT %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 +%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* %{_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 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) +%(for rust_target in %rust_targets; do +cat <