X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rust.spec;h=2142572b7c24e97c3a6ad6b9510b84d4360d8c32;hb=3b51c7fda834972eedaca2256231205bc02312e3;hp=ed6f9d89468f8c7a46a85b1d071c2ed56853c130;hpb=1736a0473122f859f8a5c4ff8a9ed45d4d1190a9;p=packages%2Frust.git diff --git a/rust.spec b/rust.spec index ed6f9d8..2142572 100644 --- a/rust.spec +++ b/rust.spec @@ -21,9 +21,9 @@ # 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.56.1 -%define bootstrap_cargo 1.56.1 -%define bootstrap_date 2021-11-01 +%define bootstrap_rust 1.63.0 +%define bootstrap_cargo %{bootstrap_rust} +%define bootstrap_date 2022-08-11 %ifarch x32 %define with_cross 1 @@ -36,23 +36,23 @@ Summary: The Rust Programming Language Summary(pl.UTF-8): Język programowania Rust Name: rust -Version: 1.57.0 -Release: 1 +Version: 1.64.0 +Release: 3 # 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: 0c7d63d9c456c4ec0f95bb6bb729c13e +# Source0-md5: e77ac3a786d013604061b17f99dd9b27 Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz -# Source1-md5: 9c12561dff9debea38e4b93f881ae2bb +# Source1-md5: fccd4c3722193f8753d2918260f8c770 Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz -# Source2-md5: 947bd95b9c8a9943d43af1bbabf1a8e1 +# Source2-md5: 6802c415076b992b3122073e258aba80 Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz -# Source3-md5: 64d78bc0747c975fe0451e4fd5b8ac4b +# Source3-md5: a38786367b5950df6e0da112df405aef Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz -# Source4-md5: a13652efd627b5e5f8bd278f378acea4 +# Source4-md5: 6bcdb6c0c6378ada390180dbc0530995 Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz -# Source5-md5: 3fb69008b1b0141d464a4a48317709b3 +# Source5-md5: 4877c64e55ae70eb4d0f93b262b37a1e URL: https://www.rust-lang.org/ # for src/compiler-rt BuildRequires: cmake >= 3.4.3 @@ -65,15 +65,16 @@ BuildRequires: rpm-build >= 4.6 BuildRequires: rpmbuild(macros) >= 1.752 %if %{without cross} BuildRequires: curl-devel -BuildRequires: libgit2-devel >= 1.3.0 +BuildRequires: libgit2-devel >= 1.4.0 BuildRequires: libstdc++-devel %if %{with system_llvm} -BuildRequires: llvm >= 10.0 -BuildRequires: llvm-devel >= 10.0 +BuildRequires: llvm >= 12.0 +BuildRequires: llvm-devel >= 12.0 %endif BuildRequires: openssl-devel >= 1.0.1 BuildRequires: tar >= 1:1.22 BuildRequires: xz +BuildRequires: xz-devel BuildRequires: zlib-devel %endif %if %{without bootstrap} @@ -88,25 +89,28 @@ 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.3.0 +BuildRequires: libgit2-devel >= 1.4.0 BuildRequires: libstdc++-devel -%{?with_system_llvm:BuildRequires: llvm-devel >= 10.0} +%{?with_system_llvm:BuildRequires: llvm-devel >= 12.0} BuildRequires: openssl-devel >= 1.0.1 +BuildRequires: xz-devel 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: libgit2-devel(x86-64) >= 1.4.0 +BuildRequires: libgit2-devel(x86-x32) >= 1.4.0 BuildRequires: libstdc++-multilib-64-devel %if %{with system_llvm} -BuildRequires: llvm-devel(x86-64) >= 10.0 -BuildRequires: llvm-devel(x86-x32) >= 10.0 +BuildRequires: llvm-devel(x86-64) >= 12.0 +BuildRequires: llvm-devel(x86-x32) >= 12.0 %endif BuildRequires: openssl-devel(x86-64) BuildRequires: openssl-devel(x86-x32) +BuildRequires: xz-devel(x86-64) +BuildRequires: xz-devel(x86-x32) BuildRequires: zlib-devel(x86-64) BuildRequires: zlib-devel(x86-x32) %endif @@ -118,8 +122,8 @@ Requires: gcc Requires: %{name}-std%{?_isa} = %{version}-%{release} %ifarch x32 Requires: %{name}-std(x86-64) = %{version}-%{release} +Requires: gcc-multilib-64 %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 @@ -143,6 +147,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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} @@ -151,6 +156,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %endif %endif +%define rust_targets %rust_triple %{?rust_suppl_targets} + %if %{without bootstrap} %define local_rust_root %{_prefix} %else @@ -216,6 +223,18 @@ 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 @@ -384,10 +403,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 \ @@ -406,7 +428,8 @@ find vendor -name .cargo-checksum.json \ --enable-vendor \ --local-rust-root=%{local_rust_root} \ --llvm-root=%{_prefix} \ - --release-channel=%{channel} + --release-channel=%{channel} \ + --set=llvm.static-libstdcpp=false export RUST_BACKTRACE=full %x_py dist --verbose @@ -416,6 +439,9 @@ export RUST_BACKTRACE=full %install rm -rf $RPM_BUILD_ROOT +export CC="%{__cc}" +export CXX="%{__cxx}" +export AR="%{__ar}" export DESTDIR=$RPM_BUILD_ROOT %x_py install @@ -432,12 +458,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.) @@ -488,16 +516,27 @@ 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}/bin -%attr(755,root,root) %{rustlibdir}/%{rust_triple}/bin/rust-llvm-dwp -%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 <