X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rust.spec;h=64397a3918ac20fb1744081b4ec5e49fe2f31ff0;hb=6c4856cef61447a85be330a5c755be813a297998;hp=2aba1916bc295b3dbe92b190f1de90bd7f176187;hpb=a973dc7e2e32cd9d4f54bc17c8740df2a959aa41;p=packages%2Frust.git diff --git a/rust.spec b/rust.spec index 2aba191..64397a3 100644 --- a/rust.spec +++ b/rust.spec @@ -18,12 +18,12 @@ %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.51.0 -%define bootstrap_cargo 1.51.0 -%define bootstrap_date 2021-03-25 +%define bootstrap_rust 1.56.1 +%define bootstrap_cargo 1.56.1 +%define bootstrap_date 2021-11-01 %ifarch x32 %define with_cross 1 @@ -36,34 +36,41 @@ Summary: The Rust Programming Language Summary(pl.UTF-8): Język programowania Rust Name: rust -Version: 1.52.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: 2df4835e3a15cc6f7e06fa4a986285d2 +# Source0-md5: 0c7d63d9c456c4ec0f95bb6bb729c13e Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz -# Source1-md5: 7640d6538716c6492e56f361e3af0631 +# Source1-md5: 9c12561dff9debea38e4b93f881ae2bb Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz -# Source2-md5: 64f117dc1ae1543c8910eaa9a971ddd4 +# Source2-md5: 947bd95b9c8a9943d43af1bbabf1a8e1 Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz -# Source3-md5: 3ac79872671df7ea0215fd351f52ffcf +# Source3-md5: 64d78bc0747c975fe0451e4fd5b8ac4b Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz -# Source4-md5: f624772d7c7ba2e83a51b4e9c1657f7b +# 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 >= 1.1.0 +BuildRequires: libgit2-devel >= 1.3.0 BuildRequires: libstdc++-devel -%{?with_system_llvm:BuildRequires: llvm-devel >= 9.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 @@ -81,9 +88,9 @@ BuildRequires: glibc-devel(x86-x32) # 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 >= 9.0} +%{?with_system_llvm:BuildRequires: llvm-devel >= 10.0} BuildRequires: openssl-devel >= 1.0.1 BuildRequires: zlib-devel %else @@ -91,12 +98,12 @@ BuildRequires: zlib-devel 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) >= 9.0 -BuildRequires: llvm-devel(x86-x32) >= 9.0 +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) @@ -112,6 +119,7 @@ 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 @@ -126,16 +134,25 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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} +%define rust_suppl_targets thumbv7neon-unknown-linux-gnueabihf +%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} @@ -162,7 +179,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) 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 } @@ -202,18 +219,6 @@ 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 -Group: Development/Tools -Requires: %{name} = %{version}-%{release} - -%description analyzer -Implementation of Language Server Protocol for Rust. - -%description analyzer -l pl.UTF-8 -Implementacja Language Server Protocol dla 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 @@ -339,9 +344,12 @@ tar xf %{SOURCE2} %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} \ @@ -359,14 +367,19 @@ test -f %{local_rust_root}/bin/rustc 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. @@ -374,10 +387,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_bootstrap_triple} \ --host=%{rust_host_triple} \ - --target=%{rust_triple} \ + --target="%(echo %rust_targets | tr ' ' ,)" \ --libdir=%{common_libdir} \ --disable-codegen-tests \ --disable-debuginfo-lines \ @@ -422,12 +438,14 @@ 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. -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.) @@ -464,8 +482,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc COPYRIGHT LICENSE-APACHE LICENSE-MIT README.md library/backtrace/crates/backtrace-sys/src/libbacktrace/LICENSE-libbacktrace -%attr(755,root,root) %{_bindir}/miri +%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 @@ -478,18 +496,24 @@ rm -rf $RPM_BUILD_ROOT %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 - -%files analyzer -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/rust-analyzer +%(for rust_target in %rust_targets; do +cat <