X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=rust.spec;h=d97bf50c59c56c8042693a30d9a8655e0e6a22eb;hb=23c4a9f42fc607b74a80898b9c2f2b9ec14a167a;hp=9aa12e3f3573d65e0e987d5c643089650ffa04e7;hpb=56b25e8bc40446e475e5ce1cd636fa945f156bf1;p=packages%2Frust.git diff --git a/rust.spec b/rust.spec index 9aa12e3..d97bf50 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.68.2 +%define bootstrap_cargo %{bootstrap_rust} +%define bootstrap_date 2023-03-28 %ifarch x32 %define with_cross 1 @@ -36,38 +36,50 @@ Summary: The Rust Programming Language Summary(pl.UTF-8): Język programowania Rust Name: rust -Version: 1.52.0 -Release: 0.1 +Version: 1.69.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: f95ca614a531b3c1edd4918eaa329732 +# Source0-md5: 2fac6c46422e743f5f05287e89e72f22 Source1: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-x86_64-unknown-linux-gnu.tar.xz -# Source1-md5: 7640d6538716c6492e56f361e3af0631 +# Source1-md5: b82ae74e630a849d6675b93ddf0ed6ca Source2: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-i686-unknown-linux-gnu.tar.xz -# Source2-md5: 64f117dc1ae1543c8910eaa9a971ddd4 +# Source2-md5: a2affbb1e831228c71f972a270717ce3 Source3: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-aarch64-unknown-linux-gnu.tar.xz -# Source3-md5: 3ac79872671df7ea0215fd351f52ffcf +# Source3-md5: 489073dd8a8380c28a570bf70c9fbd6e Source4: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-arm-unknown-linux-gnueabihf.tar.xz -# Source4-md5: f624772d7c7ba2e83a51b4e9c1657f7b -Patch0: %{name}-x32.patch +# Source4-md5: bb43d3fca2893f2de0b892e0f4a8fdb3 +Source5: https://static.rust-lang.org/dist/%{bootstrap_date}/rust-%{bootstrap_rust}-armv7-unknown-linux-gnueabihf.tar.xz +# Source5-md5: 5691b194302d66b40c3e4eee0eeb1813 +Patch0: llvm-tools-install.patch +Patch1: 111167.patch URL: https://www.rust-lang.org/ # for src/compiler-rt BuildRequires: cmake >= 3.4.3 BuildRequires: curl +%ifarch %{arm} %{mips32} %{ppc} +BuildRequires: libatomic-devel +%endif # 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.4.0 BuildRequires: libstdc++-devel -%{?with_system_llvm:BuildRequires: llvm-devel >= 9.0} +%if %{with system_llvm} +BuildRequires: llvm >= 14.0 +BuildRequires: llvm-devel >= 14.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} @@ -76,32 +88,48 @@ BuildRequires: cargo >= %{bootstrap_cargo} 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.4.0 BuildRequires: libstdc++-devel -%{?with_system_llvm:BuildRequires: llvm-devel >= 9.0} +%{?with_system_llvm:BuildRequires: llvm-devel >= 14.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) +BuildRequires: libgit2-devel(x86-64) >= 1.4.0 +BuildRequires: libgit2-devel(x86-x32) >= 1.4.0 BuildRequires: libstdc++-multilib-64-devel -%{?with_system_llvm:BuildRequires: llvm-devel(x86-64) >= 9.0} +%if %{with system_llvm} +BuildRequires: llvm-devel(x86-64) >= 14.0 +BuildRequires: llvm-devel(x86-x32) >= 14.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 %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} +Requires: gcc-multilib-64 +%endif +Obsoletes: rust-analysis < 1.69.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 @@ -112,17 +140,29 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %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} +%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} @@ -149,7 +189,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 } @@ -165,11 +205,24 @@ Rust to systemowy język programowania działający bardzo szybko, zapobiegający naruszeniom ochrony pamięci i gwarantujący bezpieczną wielowątkowość. +%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 Group: Development/Tools Requires: %{name} = %{version}-%{release} +Obsoletes: rust-rls < 1.65.0 %description analyzer Implementation of Language Server Protocol for Rust. @@ -222,18 +275,6 @@ 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} - -%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 @@ -252,7 +293,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 @@ -268,6 +309,7 @@ Summary(pl.UTF-8): Bashowe dopełnianie parametrów polecenia cargo Group: Applications/Shells Requires: %{name} = %{version}-%{release} Requires: bash-completion +BuildArch: noarch %description -n bash-completion-cargo Bash completion for cargo command. @@ -281,6 +323,7 @@ Summary(pl.UTF-8): Dopełnianie parametrów polecenia cargo w powłoce Zsh Group: Applications/Shells Requires: %{name} = %{version}-%{release} Requires: zsh +BuildArch: noarch %description -n zsh-completion-cargo Zsh completion for cargo command. @@ -290,8 +333,8 @@ Dopełnianie parametrów polecenia cargo w powłoce Zsh. %prep %setup -q -n %{rustc_package} -# irrelevant when not building rustc for x32 -#%%patch0 -p1 +%patch0 -p1 +%patch1 -p1 %if %{with bootstrap} %ifarch %{x8664} x32 @@ -303,9 +346,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} \ @@ -323,14 +369,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. @@ -338,10 +389,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 \ @@ -360,7 +414,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 @@ -370,6 +425,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 @@ -386,9 +444,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 '{}' '+' @@ -424,26 +488,34 @@ 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 -%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 std +%defattr(644,root,root,755) +%(for rust_target in %rust_targets; do +cat <