From d72b58162fd6b6ce3c248f93c510991dcac60219 Mon Sep 17 00:00:00 2001 From: happy_orange Date: Tue, 18 Apr 2023 13:59:12 +0800 Subject: [PATCH 1/2] optimise spec file --- rust.spec | 406 +++++++++++++++--------------------------------------- 1 file changed, 108 insertions(+), 298 deletions(-) diff --git a/rust.spec b/rust.spec index 9287643..67e789e 100644 --- a/rust.spec +++ b/rust.spec @@ -1,116 +1,59 @@ -%define anolis_release 2 - -# Only i686, x86_64 and aarch64 are Tier 1 platforms at this time. -# https://doc.rust-lang.org/nightly/rustc/platform-support.html +%define anolis_release 3 %global rust_arches x86_64 aarch64 - -# The channel can be stable, beta, or nightly -%{!?channel: %global channel stable} - -# To bootstrap from scratch, set the channel and date from src/stage0.json -# e.g. 1.59.0 wants rustc: 1.58.0-2022-01-13 -# or nightly wants some beta-YYYY-MM-DD +%global channel stable %global bootstrap_version 1.67.1 %global bootstrap_channel 1.67.1 %global bootstrap_date 2023-02-09 - -# Only the specified arches will use bootstrap binaries. -# NOTE: Those binaries used to be uploaded with every new release, but that was -# a waste of lookaside cache space when they're most often unused. -# Run "spectool -g rust.spec" after changing this and then "fedpkg upload" to -# add them to sources. Remember to remove them again after the bootstrap build! -#global bootstrap_arches %%{rust_arches} - -# Define a space-separated list of targets to ship rust-std-static-$triple for -# cross-compilation. The packages are noarch, but they're not fully -# reproducible between hosts, so only x86_64 actually builds it. %ifarch x86_64 %global wasm_targets wasm32-unknown-unknown wasm32-wasi %endif +%global wasi_version 19 +%global wasi_libc_source wasi-libc-wasi-sdk-%{wasi_version} +%global wasi_libc_dir %{_builddir}/%{wasi_libc_source} -# We need CRT files for *-wasi targets, at least as new as the commit in -# src/ci/docker/host-x86_64/dist-various-2/build-wasi-toolchain.sh -# (updated per https://github.com/rust-lang/rust/pull/96907) -%global wasi_libc_url https://github.com/WebAssembly/wasi-libc -%global wasi_libc_ref wasi-sdk-19 -%global wasi_libc_name wasi-libc-%{wasi_libc_ref} -%global wasi_libc_source %{wasi_libc_url}/archive/%{wasi_libc_ref}/%{wasi_libc_name}.tar.gz -%global wasi_libc_dir %{_builddir}/%{wasi_libc_name} - -# Using llvm-static may be helpful as an opt-in, e.g. to aid LLVM rebases. -%bcond_with llvm_static - -# We can also choose to just use Rust's bundled LLVM, in case the system LLVM -# is insufficient. Rust currently requires LLVM 12.0+. -%global min_llvm_version 13.0.0 -%global bundled_llvm_version 15.0.6 -%bcond_with bundled_llvm - -# Requires stable libgit2 1.5, and not the next minor soname change. -# This needs to be consistent with the bindings in vendor/libgit2-sys. -%global min_libgit2_version 1.5.0 -%global next_libgit2_version 1.6.0~ -%global bundled_libgit2_version 1.5.0 -%bcond_with bundled_libgit2 - -# needs libssh2_userauth_publickey_frommemory -%global min_libssh2_version 1.6.0 -%bcond_with disabled_libssh2 +%bcond_with bootstrap +%bcond_with static %bcond_without curl_http2 - -# LLDB isn't available everywhere... %bcond_without lldb +%bcond_without cmake_path +%bcond_without debug + +%bcond_with bundled_libgit2 +%global ligbit2_version 1.5.0 +%global next_ligbit2_version 1.6.0~ +%bcond_with libssh2 +%global libssh2_version 1.6.0 Name: rust Version: 1.68.2 Release: %{anolis_release}%{?dist} Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) -# ^ written as: (rust itself) and (bundled libraries) URL: https://www.rust-lang.org -ExclusiveArch: %{rust_arches} -%if "%{channel}" == "stable" -%global rustc_package rustc-%{version}-src -%else -%global rustc_package rustc-%{channel}-src -%endif -Source0: https://static.rust-lang.org/dist/%{rustc_package}.tar.xz -Source1: %{wasi_libc_source} -# Sources for bootstrap_arches are inserted by lua below - -# By default, rust tries to use "rust-lld" as a linker for WebAssembly. -Patch1: 0001-Use-lld-provided-by-system-for-wasm.patch +ExclusiveArch: %{rust_arches} -# Set a substitute-path in rust-gdb for standard library sources. -Patch2: rustc-1.61.0-rust-gdb-substitute-path.patch +Source0: https://static.rust-lang.org/dist/rustc-%{version}-src.tar.xz +Source1: https://github.com/WebAssembly/wasi-libc/archive/wasi-sdk-%{wasi_version}/%{wasi_libc_source}.tar.gz -### Distro-specific patches below ### -# Simple rpm macros for rust-toolset (as opposed to full rust-packaging) Source100: macros.rust-toolset -# Default to use ustc as crates source Source101: cargo-config Source102: cargo-config.sh Source103: cargo-config.csh -# Disable cargo->libgit2->libssh2 +Patch1: 0001-Use-lld-provided-by-system-for-wasm.patch +Patch2: rustc-1.61.0-rust-gdb-substitute-path.patch Patch100: rustc-1.65.0-disable-libssh2.patch - -# libcurl on old distro doesn't have http2, but since cargo requests it, curl-sys -# will try to build it statically -- instead we turn off the feature. Patch101: rustc-1.68.0-disable-http2.patch -# Get the Rust triple for any arch. %{lua: function rust_triple(arch) return arch.."-unknown-linux-gnu" end} %global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))} -%if %defined bootstrap_arches -# For each bootstrap arch, add an additional binary Source. -# Also define bootstrap_source just for the current target. +%if %{with bootstrap} %{lua: do local bootstrap_arches = {} for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do @@ -135,106 +78,72 @@ end} end} %endif -%ifarch %{bootstrap_arches} +%if %{with bootstrap} %global local_rust_root %{_builddir}/rust-%{bootstrap_suffix} Provides: bundled(%{name}-bootstrap) = %{bootstrap_version} %else +%global local_rust_root %{_prefix} BuildRequires: cargo >= %{bootstrap_version} BuildRequires: (%{name} >= %{bootstrap_version} with %{name} <= %{version}) -%global local_rust_root %{_prefix} %endif -BuildRequires: make -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: ncurses-devel -# explicit curl-devel to avoid httpd24-curl (rhbz1540167) -BuildRequires: curl-devel -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(liblzma) -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(zlib) +BuildRequires: make gcc gcc-c++ autoconf automake gdb clang lld +BuildRequires: glibc-static llvm-devel +BuildRequires: ncurses-devel curl-devel pkgconfig(libcurl) procps-ng +BuildRequires: pkgconfig(liblzma) pkgconfig(openssl) pkgconfig(zlib) +BuildRequires: python3 python3-rpm-macros procps-ng gdb +BuildRequires: git-core libxml2-devel %if %{without bundled_libgit2} -BuildRequires: (pkgconfig(libgit2) >= %{min_libgit2_version} with pkgconfig(libgit2) < %{next_libgit2_version}) +BuildRequires: (pkgconfig(libgit2) >= %{ligbit2_version} with pkgconfig(libgit2) < %{next_ligbit2_version}) %endif -%if %{without disabled_libssh2} -BuildRequires: pkgconfig(libssh2) >= %{min_libssh2_version} +%if %{with libssh2} +BuildRequires: pkgconfig(libssh2) >= %{libssh2_version} %endif -BuildRequires: python3 -BuildRequires: python3-rpm-macros - -%if %with bundled_llvm +%if %{with bootstrap} BuildRequires: cmake3 >= 3.13.4 BuildRequires: ninja-build -Provides: bundled(llvm) = %{bundled_llvm_version} -%else +Provides: bundled(llvm) = 15.0.6 +%endif + +%if %{without bootstrap} BuildRequires: cmake >= 2.8.11 -%if %defined llvm -%global llvm_root %{_libdir}/%{llvm} -%else -%global llvm llvm %global llvm_root %{_prefix} %endif -BuildRequires: %{llvm}-devel >= %{min_llvm_version} -%if %with llvm_static -BuildRequires: %{llvm}-static + +%if %{with static} +BuildRequires: llvm-static BuildRequires: libffi-devel %endif -%endif - -# make check needs "ps" for src/test/ui/wait-forked-but-failed-child.rs -BuildRequires: procps-ng - -# debuginfo-gdb tests need gdb -BuildRequires: gdb - -# For src/test/run-make/static-pie -BuildRequires: glibc-static - -# Virtual provides for folks who attempt "dnf install rustc" -Provides: rustc = %{version}-%{release} -Provides: rustc = %{version}-%{release} -# Always require our exact standard library -Requires: %{name}-std-static = %{version}-%{release} +Provides: rustc = %{EVR} +Provides: rustc = %{EVR} -# 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: %{name}-std-static = %{EVR} Requires: /usr/bin/cc %global __ranlib %{_bindir}/ranlib -# ALL Rust libraries are private, because they don't keep an ABI. %global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.* %global __provides_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$ %global __provides_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ %global __requires_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ -# While we don't want to encourage dynamic linking to Rust shared libraries, as -# there's no stable ABI, we still need the unallocated metadata (.rustc) to -# support custom-derive plugins like #[proc_macro_derive(Foo)]. %global _find_debuginfo_opts --keep-section .rustc -%if %{without bundled_llvm} -%if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1} -%global llvm_has_filecheck 1 -%endif +%if %{without bootstrap} +%bcond_without llvm_has_filecheck %endif -# We're going to override --libdir when configuring to get rustlib into a -# common path, but we'll fix the shared libraries during install. %global common_libdir %{_prefix}/lib %global rustlibdir %{common_libdir}/rustlib -%if %defined wasm_targets +%ifarch x86_64 BuildRequires: clang BuildRequires: lld -# brp-strip-static-archive breaks the archive index for wasm %global __os_install_post \ %__os_install_post \ find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)' -print -exec '%{llvm_root}/bin/llvm-ranlib' '{}' ';' \ @@ -244,14 +153,13 @@ find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)' %description Rust is a systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety. - This package includes the Rust compiler and documentation generator. %package std-static Summary: Standard library for Rust -Provides: %{name}-std-static-%{rust_triple} = %{version}-%{release} -Requires: %{name} = %{version}-%{release} +Provides: %{name}-std-static-%{rust_triple} = %{EVR} +Requires: %{name} = %{EVR} Requires: glibc-devel >= 2.17 %description std-static @@ -264,7 +172,7 @@ written in Rust. local subs = { triple = triple, name = rpm.expand("%{name}"), - verrel = rpm.expand("%{version}-%{release}"), + verrel = rpm.expand("%{EVR}"), wasi = string.find(triple, "-wasi") and 1 or 0, } local s = string.gsub([[ @@ -296,26 +204,23 @@ BuildArch: noarch %description debugger-common This package includes the common functionality for %{name}-gdb and %{name}-lldb. - %package gdb Summary: GDB pretty printers for Rust BuildArch: noarch Requires: gdb -Requires: %{name}-debugger-common = %{version}-%{release} +Requires: %{name}-debugger-common = %{EVR} %description gdb This package includes the rust-gdb script, which allows easier debugging of Rust programs. -%if %with lldb - +%if %{with lldb} %package lldb Summary: LLDB pretty printers for Rust BuildArch: noarch -Requires: lldb -Requires: python3-lldb -Requires: %{name}-debugger-common = %{version}-%{release} +Requires: lldb python3-lldb +Requires: %{name}-debugger-common = %{EVR} %description lldb This package includes the rust-lldb script, which allows easier debugging of Rust @@ -326,35 +231,22 @@ programs. %package doc Summary: Documentation for Rust -# NOT BuildArch: noarch -# Note, while docs are mostly noarch, some things do vary by target_arch. -# Koji will fail the build in rpmdiff if two architectures build a noarch -# subpackage differently, so instead we have to keep its arch. - -# Cargo no longer builds its own documentation -# https://github.com/rust-lang/cargo/pull/4904 -# We used to keep a shim cargo-doc package, but now that's merged too. -Obsoletes: cargo-doc < 1.65.0~ -Provides: cargo-doc = %{version}-%{release} +Requires: %{name} = %{EVR} +Provides: cargo-doc = %{EVR} +Obsoletes: cargo-doc < %{EVR} %description doc This package includes HTML documentation for the Rust programming language and its standard library. - %package -n cargo Summary: Rust's package manager and build tool -%if %with bundled_libgit2 -Provides: bundled(libgit2) = %{bundled_libgit2_version} +Requires: %{name} = %{EVR} +Provides: cargo-vendor = %{EVR} +Obsoletes: cargo-vendor < %{EVR} +%if %{with bundled_libgit2} +Provides: bundled(libgit2) = %{ligbit2_version} %endif -# For tests: -BuildRequires: git-core -# Cargo is not much use without Rust -Requires: %{name} - -# "cargo vendor" is a builtin command starting with 1.37. -Obsoletes: cargo-vendor <= 0.1.23 -Provides: cargo-vendor = %{version}-%{release} %description -n cargo Cargo is a tool that allows Rust projects to declare their various dependencies @@ -364,26 +256,16 @@ and ensure that you'll always get a repeatable build. %package -n rustfmt Summary: Tool to find and fix Rust formatting issues Requires: cargo - -# The component/package was rustfmt-preview until Rust 1.31. -Obsoletes: rustfmt-preview < 1.0.0 -Provides: rustfmt-preview = %{version}-%{release} +Provides: rustfmt-preview = %{EVR} +Obsoletes: rustfmt-preview < %{EVR} %description -n rustfmt A tool for formatting Rust code according to style guidelines. - %package analyzer Summary: Rust implementation of the Language Server Protocol - -# The standard library sources are needed for most functionality. -Recommends: %{name}-src - -# RLS is no longer available as of Rust 1.65, but we're including the stub -# binary that implements LSP just enough to recommend rust-analyzer. -Obsoletes: rls < 1.65.0~ -# The component/package was rls-preview until Rust 1.31. -Obsoletes: rls-preview < 1.31.6 +Recommends: %{name}-src = %{EVR} +Obsoletes: rls < %{EVR} rls-preview < %{EVR} %description analyzer rust-analyzer is an implementation of Language Server Protocol for the Rust @@ -393,13 +275,9 @@ for many code editors, including VS Code, Emacs and Vim. %package -n clippy Summary: Lints to catch common mistakes and improve your Rust code -Requires: cargo -# /usr/bin/clippy-driver is dynamically linked against internal rustc libs -Requires: %{name} = %{version}-%{release} - -# The component/package was clippy-preview until Rust 1.31. -Obsoletes: clippy-preview <= 0.0.212 -Provides: clippy-preview = %{version}-%{release} +Requires: cargo %{name} = %{EVR} +Provides: clippy-preview = %{EVR} +Obsoletes: clippy-preview < %{EVR} %description -n clippy A collection of lints to catch common mistakes and improve your Rust code. @@ -408,7 +286,7 @@ A collection of lints to catch common mistakes and improve your Rust code. %package src Summary: Sources for the Rust standard library BuildArch: noarch -Recommends: %{name}-std-static = %{version}-%{release} +Recommends: %{name}-std-static = %{EVR} %description src This package includes source files for the Rust standard library. It may be @@ -417,7 +295,7 @@ useful as a reference for code completion tools in various editors. %package analysis Summary: Compiler analysis data for the Rust standard library -Recommends: %{name}-std-static = %{version}-%{release} +Recommends: %{name}-std-static = %{EVR} %description analysis This package contains analysis data files produced with rustc's -Zsave-analysis @@ -426,18 +304,15 @@ data to provide information about the Rust standard library. %package toolset Summary: Rust Toolset -Requires: rust = %{version}-%{release} -Requires: cargo = %{version}-%{release} +Requires: rust = %{EVR} cargo = %{EVR} Buildarch: noarch %description toolset This is the metapackage for Rust Toolset, bringing in the Rust compiler, the Cargo package manager, and a few convenience macros for rpm builds. - %prep - -%ifarch %{bootstrap_arches} +%if %{with bootstrap} rm -rf %{local_rust_root} %setup -q -n cargo-%{bootstrap_suffix} -T -b %{bootstrap_source_cargo} ./install.sh --prefix=%{local_rust_root} --disable-ldconfig @@ -450,35 +325,31 @@ test -f '%{local_rust_root}/bin/rustc' %endif %if %defined wasm_targets -%setup -q -n %{wasi_libc_name} -T -b 1 +%setup -q -n %{wasi_libc_source} -T -b 1 %endif -%setup -q -n %{rustc_package} - +%setup -q -n rustc-%{version}-src %patch1 -p1 %patch2 -p1 -%if %with disabled_libssh2 +%if %{without libssh2} %patch100 -p1 %endif -%if %without curl_http2 +%if %{without curl_http2} %patch101 -p1 rm -rf vendor/libnghttp2-sys/ %endif -# Use our explicit python3 first sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure -# Set a substitute-path in rust-gdb for standard library sources. sed -i.rust-src -e "s#@BUILDDIR@#$PWD#" ./src/etc/rust-gdb -%if %without bundled_llvm +%if %{without bootstrap} rm -rf src/llvm-project/ mkdir -p src/llvm-project/libunwind/ %endif -# Remove other unused vendored libraries rm -rf vendor/curl-sys/curl/ rm -rf vendor/*jemalloc-sys*/jemalloc/ rm -rf vendor/libmimalloc-sys/c_src/mimalloc/ @@ -488,47 +359,35 @@ rm -rf vendor/libz-sys/src/zlib-ng/ rm -rf vendor/lzma-sys/xz-*/ rm -rf vendor/openssl-src/openssl/ -%if %without bundled_libgit2 +%if %{without bundled_libgit2} rm -rf vendor/libgit2-sys/libgit2/ %endif -%if %with disabled_libssh2 +%if %{without libssh2} rm -rf vendor/libssh2-sys/ %endif -# This only affects the transient rust-installer, but let it use our dynamic xz-libs sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs -%if %{without bundled_llvm} && %{with llvm_static} -# Static linking to distro LLVM needs to add -lffi -# https://github.com/rust-lang/rust/issues/34486 +%if %{without bootstrap} && %{with static} sed -i.ffi -e '$a #[link(name = "ffi")] extern {}' \ compiler/rustc_llvm/src/lib.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. find vendor -name .cargo-checksum.json \ -exec sed -i.uncheck -e 's/"files":{[^}]*}/"files":{ }/' '{}' '+' -# Sometimes Rust sources start with #![...] attributes, and "smart" editors think -# it's a shebang and make them executable. Then brp-mangle-shebangs gets upset... find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+' -# The distro flags are only appropriate for the host, not our cross-targets, -# and they're not as fine-grained as the settings we choose for std vs rustc. -%if %defined build_rustflags +%if %{defined build_rustflags} %global build_rustflags %{nil} %endif -# Set up shared environment variables for build/install/check %global rust_env %{?rustflags:RUSTFLAGS="%{rustflags}"} -%if 0%{?cmake_path:1} +%if %{with cmake_path} %global rust_env %{?rust_env} PATH="%{cmake_path}:$PATH" %endif -%if %without disabled_libssh2 -# convince libssh2-sys to use the distro libssh2 +%if %{with libssh2} %global rust_env %{?rust_env} LIBSSH2_SYS_USE_PKG_CONFIG=1 %endif %global export_rust_env %{?rust_env:export %{rust_env}} @@ -537,30 +396,12 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+' %build %{export_rust_env} -%define enable_debuginfo --debuginfo-level=2 - -# Some builders have relatively little memory for their CPU count. -# At least 2GB per CPU is a good rule of thumb for building rustc. ncpus=$(/usr/bin/getconf _NPROCESSORS_ONLN) max_cpus=$(( ($(free -g | awk '/^Mem:/{print $2}') + 1) / 2 )) if [ "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ]; then ncpus="$max_cpus" fi -%if %defined wasm_targets -%make_build --quiet -C %{wasi_libc_dir} CC=clang AR=llvm-ar NM=llvm-nm -%{lua: do - local wasi_root = rpm.expand("%{wasi_libc_dir}") .. "/sysroot" - local cfg = "" - for triple in string.gmatch(rpm.expand("%{wasm_targets}"), "%S+") do - if string.find(triple, "-wasi") then - cfg = cfg .. " --set target." .. triple .. ".wasi-root=" .. wasi_root - end - end - rpm.define("wasm_target_config "..cfg) -end} -%endif - %configure --disable-option-checking \ --libdir=%{common_libdir} \ --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \ @@ -569,16 +410,27 @@ end} --set target.%{rust_triple}.cxx=%{__cxx} \ --set target.%{rust_triple}.ar=%{__ar} \ --set target.%{rust_triple}.ranlib=%{__ranlib} \ +%ifarch x86_64 + --set target.wasm32-wasi.wasi-root=%{wasi_libc_dir}/sysroot \ +%endif %{?wasm_target_config} \ --python=%{__python3} \ --local-rust-root=%{local_rust_root} \ --set build.rustfmt=/bin/true \ - %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \ - %{!?llvm_has_filecheck: --disable-codegen-tests} \ - %{!?with_llvm_static: --enable-llvm-link-shared } } \ +%if %{without bootstrap} + --llvm-root=%{llvm_root} \ +%endif +%if %{without llvm_has_filecheck} + --disable-codegen-tests \ +%endif +%if %{with static} + --enable-llvm-link-shared \ +%endif --disable-llvm-static-stdcpp \ --disable-rpath \ - %{enable_debuginfo} \ +%if %{with debug} + --debuginfo-level=2 \ +%endif --set rust.codegen-units-std=1 \ --set build.build-stage=2 \ --set build.doc-stage=2 \ @@ -590,7 +442,7 @@ end} --enable-verbose-tests \ --dist-compression-formats=gz \ --release-channel=%{channel} \ - --release-description="Anolis %{anolis_ver} %{version}-%{release}" + --release-description="Anolis %{anolis_ver} %{EVR}" %{__python3} ./x.py build -j "$ncpus" %{__python3} ./x.py doc @@ -608,81 +460,48 @@ for triple in %{?wasm_targets}; do DESTDIR=%{buildroot} %{__python3} ./x.py install --target=$triple std done -# The rls stub doesn't have an install target, but we can just copy it. %{__install} -t %{buildroot}%{_bindir} build/%{rust_triple}/stage2-tools-bin/rls -# These are transient files used by x.py dist and install rm -rf ./build/dist/ ./build/tmp/ -# Make sure the shared libraries are in the proper libdir %if "%{_libdir}" != "%{common_libdir}" mkdir -p %{buildroot}%{_libdir} find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \ -exec mv -v -t %{buildroot}%{_libdir} '{}' '+' %endif -# The shared libraries should be executable for debuginfo extraction. find %{buildroot}%{_libdir} -maxdepth 1 -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. find %{buildroot}%{rustlibdir}/%{rust_triple}/lib/ -maxdepth 1 -type f -name '*.so' | while read lib; do lib2="%{buildroot}%{_libdir}/${lib##*/}" if [ -f "$lib2" ]; then - # make sure they're actually identical! cmp "$lib" "$lib2" ln -v -f -r -s -T "$lib2" "$lib" fi done -# Remove installer artifacts (manifests, uninstall scripts, etc.) find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+' - -# Remove backup files from %%configure munging find %{buildroot}%{rustlibdir} -type f -name '*.orig' -exec rm -v '{}' '+' - -# We don't actually need to ship any of those python scripts in rust-src anyway. find %{buildroot}%{rustlibdir}/src -type f -name '*.py' -exec rm -v '{}' '+' -# FIXME: __os_install_post will strip the rlibs -# -- should we find a way to preserve debuginfo? - -# Remove unwanted documentation files (we already package them) -rm -f %{buildroot}%{_docdir}/%{name}/README.md -rm -f %{buildroot}%{_docdir}/%{name}/COPYRIGHT -rm -f %{buildroot}%{_docdir}/%{name}/LICENSE -rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-APACHE -rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-MIT -rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-THIRD-PARTY -rm -f %{buildroot}%{_docdir}/%{name}/*.old - -# Sanitize the HTML documentation -find %{buildroot}%{_docdir}/%{name}/html -empty -delete -find %{buildroot}%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+' +for d_file in README.md COPYRIGHT LICENSE* *.old html; do: + rm -rf %{buildroot}%{_docdir}/%{d_file} +done -# Create the path for crate-devel packages mkdir -p %{buildroot}%{_datadir}/cargo/registry - -# Cargo no longer builds its own documentation -# https://github.com/rust-lang/cargo/pull/4904 mkdir -p %{buildroot}%{_docdir}/cargo ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html -%if %without lldb +%if %{without lldb} rm -f %{buildroot}%{_bindir}/rust-lldb rm -f %{buildroot}%{rustlibdir}/etc/lldb_* %endif -# We don't want Rust copies of LLVM tools (rust-lld, rust-llvm-dwp) rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll* -# This allows users to build packages using Rust Toolset. %{__install} -D -m 644 %{SOURCE100} %{buildroot}%{rpmmacrodir}/macros.rust-toolset - -# Default to use ustc mirror for crates %{__install} -D -m 644 %{SOURCE101} %{buildroot}%{_sysconfdir}/skel/.cargo/config.toml %{__install} -D -m 644 %{SOURCE102} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.sh %{__install} -D -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.csh @@ -690,38 +509,27 @@ rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll* %check %{export_rust_env} -# Sanity-check the installed binaries, debuginfo-stripped and all. %{buildroot}%{_bindir}/cargo new build/hello-world env RUSTC=%{buildroot}%{_bindir}/rustc \ LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" \ %{buildroot}%{_bindir}/cargo run --manifest-path build/hello-world/Cargo.toml -# Try a build sanity-check for other targets for triple in %{?wasm_targets}; do env RUSTC=%{buildroot}%{_bindir}/rustc \ LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" \ %{buildroot}%{_bindir}/cargo build --manifest-path build/hello-world/Cargo.toml --target=$triple done -# The results are not stable on koji, so mask errors and just log it. -# Some of the larger test artifacts are manually cleaned to save space. %{__python3} ./x.py test --no-fail-fast || : rm -rf "./build/%{rust_triple}/test/" - %{__python3} ./x.py test --no-fail-fast cargo || : rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" - %{__python3} ./x.py test --no-fail-fast clippy || : - %{__python3} ./x.py test --no-fail-fast rust-analyzer || : - %{__python3} ./x.py test --no-fail-fast rustfmt || : - - %files %license COPYRIGHT LICENSE-APACHE LICENSE-MIT -%doc README.md %{_bindir}/rustc %{_bindir}/rustdoc %{_libdir}/*.so @@ -733,14 +541,13 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %dir %{rustlibdir}/%{rust_triple}/lib %{rustlibdir}/%{rust_triple}/lib/*.so - %files std-static %dir %{rustlibdir} %dir %{rustlibdir}/%{rust_triple} %dir %{rustlibdir}/%{rust_triple}/lib %{rustlibdir}/%{rust_triple}/lib/*.rlib -%if %defined wasm_targets +%ifarch x86_64 %{lua: do for triple in string.gmatch(rpm.expand("%{wasm_targets}"), "%S+") do local subs = { @@ -788,10 +595,10 @@ end} %files doc +%doc README.md %docdir %{_docdir}/%{name} %dir %{_docdir}/%{name} %{_docdir}/%{name}/html -# former cargo-doc %docdir %{_docdir}/cargo %dir %{_docdir}/cargo %{_docdir}/cargo/html @@ -844,6 +651,9 @@ end} %{rpmmacrodir}/macros.rust-toolset %changelog +* Tue Apr 18 2023 happy_orange - 1.68.2-3 +- optimise spec file + * Sat Apr 8 2023 Funda Wang - 1.68.2-2 - Default to use ustc mirror for crates - Cleanup spec -- Gitee From 706721ae21b182f98846a2d880dbb466b15488ad Mon Sep 17 00:00:00 2001 From: happy_orange Date: Wed, 19 Apr 2023 12:37:43 +0800 Subject: [PATCH 2/2] optimise spec file --- ...ustc-1.61.0-rust-gdb-substitute-path.patch | 0 ...=> 0003-rustc-1.65.0-disable-libssh2.patch | 0 ...h => 0004-rustc-1.68.0-disable-http2.patch | 0 0005-adjust-makefile-for-llvm16.patch | 31 + 107360-modified.patch | 26 - bootstrap | 25 + rust.spec | 541 ++++++++---------- 7 files changed, 291 insertions(+), 332 deletions(-) rename rustc-1.61.0-rust-gdb-substitute-path.patch => 0002-rustc-1.61.0-rust-gdb-substitute-path.patch (100%) rename rustc-1.65.0-disable-libssh2.patch => 0003-rustc-1.65.0-disable-libssh2.patch (100%) rename rustc-1.68.0-disable-http2.patch => 0004-rustc-1.68.0-disable-http2.patch (100%) create mode 100644 0005-adjust-makefile-for-llvm16.patch delete mode 100644 107360-modified.patch create mode 100644 bootstrap diff --git a/rustc-1.61.0-rust-gdb-substitute-path.patch b/0002-rustc-1.61.0-rust-gdb-substitute-path.patch similarity index 100% rename from rustc-1.61.0-rust-gdb-substitute-path.patch rename to 0002-rustc-1.61.0-rust-gdb-substitute-path.patch diff --git a/rustc-1.65.0-disable-libssh2.patch b/0003-rustc-1.65.0-disable-libssh2.patch similarity index 100% rename from rustc-1.65.0-disable-libssh2.patch rename to 0003-rustc-1.65.0-disable-libssh2.patch diff --git a/rustc-1.68.0-disable-http2.patch b/0004-rustc-1.68.0-disable-http2.patch similarity index 100% rename from rustc-1.68.0-disable-http2.patch rename to 0004-rustc-1.68.0-disable-http2.patch diff --git a/0005-adjust-makefile-for-llvm16.patch b/0005-adjust-makefile-for-llvm16.patch new file mode 100644 index 0000000..3fce536 --- /dev/null +++ b/0005-adjust-makefile-for-llvm16.patch @@ -0,0 +1,31 @@ +From 7e43796197679151eb7c2d6ef590bd67fc1c6df8 Mon Sep 17 00:00:00 2001 +From: Mike Hommey +Date: Tue, 10 Jan 2023 09:09:14 +0900 +Subject: [PATCH] Adjust Makefile for LLVM trunk (16) as of 2023-01-05 + +https://github.com/llvm/llvm-project/commit/d227c3b68cf5c236902c9ff4fdf8b719c9a3dd26 +added __GCC_HAVE_SYNC_COMPARE_AND_SWAP macros. +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 46229f93..27f6760f 100644 +--- a/Makefile ++++ b/Makefile +@@ -668,6 +668,7 @@ check-symbols: startup_files libc + @# TODO: Undefine __FLOAT128__ for now since it's not in clang 8.0. + @# TODO: Filter out __FLT16_* for now, as not all versions of clang have these. + @# TODO: Filter out __NO_MATH_ERRNO_ and a few __*WIDTH__ that are new to clang 14. ++ @# TODO: Filter out __GCC_HAVE_SYNC_COMPARE_AND_SWAP_* that are new to clang 16. + @# TODO: clang defined __FLT_EVAL_METHOD__ until clang 15, so we force-undefine it + @# for older versions. + @# TODO: Undefine __wasm_mutable_globals__ and __wasm_sign_ext__, that are new to +@@ -700,6 +701,7 @@ check-symbols: startup_files libc + | sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \ + | grep -v '^#define __FLT16_' \ + | grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \ ++ | grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \ + > "$(SYSROOT_SHARE)/predefined-macros.txt" + + # Check that the computed metadata matches the expected metadata. diff --git a/107360-modified.patch b/107360-modified.patch deleted file mode 100644 index 3d59653..0000000 --- a/107360-modified.patch +++ /dev/null @@ -1,26 +0,0 @@ -From de363d54c40a378717881240e719f5f7223ba376 Mon Sep 17 00:00:00 2001 -From: bjorn3 <17426603+bjorn3@users.noreply.github.com> -Date: Fri, 27 Jan 2023 11:48:36 +0000 -Subject: [PATCH 3/4] Revert back to LlvmArchiveBuilder on all platforms - -ArArchiveBuilder doesn't support reading thin archives, causing a -regression. ---- - compiler/rustc_codegen_llvm/src/back/archive.rs | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/compiler/rustc_codegen_llvm/src/back/archive.rs b/compiler/rustc_codegen_llvm/src/back/archive.rs -index b00676b7c592b..58ca87524deb6 100644 ---- a/compiler/rustc_codegen_llvm/src/back/archive.rs -+++ b/compiler/rustc_codegen_llvm/src/back/archive.rs -@@ -108,7 +108,9 @@ pub struct LlvmArchiveBuilderBuilder; - - impl ArchiveBuilderBuilder for LlvmArchiveBuilderBuilder { - fn new_archive_builder<'a>(&self, sess: &'a Session) -> Box + 'a> { -- if sess.target.arch == "wasm32" || sess.target.arch == "wasm64" { -+ // FIXME use ArArchiveBuilder on most targets again once reading thin archives is -+ // implemented -+ if true || sess.target.arch == "wasm32" || sess.target.arch == "wasm64" { - Box::new(LlvmArchiveBuilder { sess, additions: Vec::new() }) - } else { - Box::new(ArArchiveBuilder::new(sess, get_llvm_object_symbols)) diff --git a/bootstrap b/bootstrap new file mode 100644 index 0000000..d4fd0f5 --- /dev/null +++ b/bootstrap @@ -0,0 +1,25 @@ +%if %{with bootstrap} +%{lua: do + local bootstrap_arches = {} + for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do + table.insert(bootstrap_arches, arch) + end + local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}") + local channel = rpm.expand("%{bootstrap_version}") + local target_arch = rpm.expand("%{_target_cpu}") + for i, arch in ipairs(bootstrap_arches) do + i = 1000 + i * 3 + local suffix = channel.."-"..rust_triple(arch) + print(string.format("Source%d: %s/cargo-%s.tar.xz\n", i, base, suffix)) + print(string.format("Source%d: %s/rustc-%s.tar.xz\n", i+1, base, suffix)) + print(string.format("Source%d: %s/rust-std-%s.tar.xz\n", i+2, base, suffix)) + if arch == target_arch then + rpm.define("bootstrap_source_cargo "..i) + rpm.define("bootstrap_source_rustc "..i+1) + rpm.define("bootstrap_source_std "..i+2) + rpm.define("bootstrap_suffix "..suffix) + end + end +end} +%endif + diff --git a/rust.spec b/rust.spec index 67e789e..898ea70 100644 --- a/rust.spec +++ b/rust.spec @@ -2,28 +2,45 @@ %global rust_arches x86_64 aarch64 %global channel stable %global bootstrap_version 1.67.1 -%global bootstrap_channel 1.67.1 %global bootstrap_date 2023-02-09 +%global __ranlib %{_bindir}/ranlib +%global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.* +%global __provides_exclude ^(%{_privatelibs})$ +%global __requires_exclude ^(%{_privatelibs})$ +%global __provides_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ +%global __requires_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ +%global _find_debuginfo_opts --keep-section .rustc +%global common_libdir %{_prefix}/lib +%global rustlibdir %{common_libdir}/rustlib + %ifarch x86_64 +%bcond_without wasm +%endif + +%if %{with wasm} %global wasm_targets wasm32-unknown-unknown wasm32-wasi %endif -%global wasi_version 19 -%global wasi_libc_source wasi-libc-wasi-sdk-%{wasi_version} + +%global wasi_libc_source wasi-libc-wasi-sdk-19 %global wasi_libc_dir %{_builddir}/%{wasi_libc_source} %bcond_with bootstrap %bcond_with static +%bcond_with cmake_path +%bcond_with bundled_libgit2 %bcond_without curl_http2 %bcond_without lldb -%bcond_without cmake_path %bcond_without debug +%bcond_without libssh2 -%bcond_with bundled_libgit2 %global ligbit2_version 1.5.0 %global next_ligbit2_version 1.6.0~ -%bcond_with libssh2 %global libssh2_version 1.6.0 +%if %{without bootstrap} +%bcond_without llvm_has_filecheck +%endif + Name: rust Version: 1.68.2 Release: %{anolis_release}%{?dist} @@ -31,21 +48,21 @@ Summary: The Rust Programming Language License: (ASL 2.0 or MIT) and (BSD and MIT) URL: https://www.rust-lang.org -ExclusiveArch: %{rust_arches} - Source0: https://static.rust-lang.org/dist/rustc-%{version}-src.tar.xz -Source1: https://github.com/WebAssembly/wasi-libc/archive/wasi-sdk-%{wasi_version}/%{wasi_libc_source}.tar.gz - +Source1: https://github.com/WebAssembly/wasi-libc/archive/wasi-sdk-19/%{wasi_libc_source}.tar.gz Source100: macros.rust-toolset Source101: cargo-config Source102: cargo-config.sh Source103: cargo-config.csh +Source104: bootstrap -Patch1: 0001-Use-lld-provided-by-system-for-wasm.patch -Patch2: rustc-1.61.0-rust-gdb-substitute-path.patch -Patch100: rustc-1.65.0-disable-libssh2.patch -Patch101: rustc-1.68.0-disable-http2.patch +Patch0001: 0001-Use-lld-provided-by-system-for-wasm.patch +Patch0002: 0002-rustc-1.61.0-rust-gdb-substitute-path.patch +Patch0003: 0003-rustc-1.65.0-disable-libssh2.patch +Patch0004: 0004-rustc-1.68.0-disable-http2.patch +Patch0005: 0005-adjust-makefile-for-llvm16.patch +ExclusiveArch: %{rust_arches} %{lua: function rust_triple(arch) return arch.."-unknown-linux-gnu" @@ -53,40 +70,6 @@ end} %global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))} -%if %{with bootstrap} -%{lua: do - local bootstrap_arches = {} - for arch in string.gmatch(rpm.expand("%{bootstrap_arches}"), "%S+") do - table.insert(bootstrap_arches, arch) - end - local base = rpm.expand("https://static.rust-lang.org/dist/%{bootstrap_date}") - local channel = rpm.expand("%{bootstrap_channel}") - local target_arch = rpm.expand("%{_target_cpu}") - for i, arch in ipairs(bootstrap_arches) do - i = 1000 + i * 3 - local suffix = channel.."-"..rust_triple(arch) - print(string.format("Source%d: %s/cargo-%s.tar.xz\n", i, base, suffix)) - print(string.format("Source%d: %s/rustc-%s.tar.xz\n", i+1, base, suffix)) - print(string.format("Source%d: %s/rust-std-%s.tar.xz\n", i+2, base, suffix)) - if arch == target_arch then - rpm.define("bootstrap_source_cargo "..i) - rpm.define("bootstrap_source_rustc "..i+1) - rpm.define("bootstrap_source_std "..i+2) - rpm.define("bootstrap_suffix "..suffix) - end - end -end} -%endif - -%if %{with bootstrap} -%global local_rust_root %{_builddir}/rust-%{bootstrap_suffix} -Provides: bundled(%{name}-bootstrap) = %{bootstrap_version} -%else -%global local_rust_root %{_prefix} -BuildRequires: cargo >= %{bootstrap_version} -BuildRequires: (%{name} >= %{bootstrap_version} with %{name} <= %{version}) -%endif - BuildRequires: make gcc gcc-c++ autoconf automake gdb clang lld BuildRequires: glibc-static llvm-devel BuildRequires: ncurses-devel curl-devel pkgconfig(libcurl) procps-ng @@ -103,47 +86,31 @@ BuildRequires: pkgconfig(libssh2) >= %{libssh2_version} %endif %if %{with bootstrap} -BuildRequires: cmake3 >= 3.13.4 -BuildRequires: ninja-build +%global local_rust_root %{_builddir}/rust-%{bootstrap_suffix} +BuildRequires: cmake3 >= 3.13.4 ninja-build +Provides: bundled(%{name}-bootstrap) = %{bootstrap_version} Provides: bundled(llvm) = 15.0.6 -%endif - -%if %{without bootstrap} -BuildRequires: cmake >= 2.8.11 +%else %global llvm_root %{_prefix} +%global local_rust_root %{_prefix} +BuildRequires: cargo >= %{bootstrap_version} cmake >= 2.8.11 +BuildRequires: (%{name} >= %{bootstrap_version} with %{name} <= %{version}) %endif %if %{with static} -BuildRequires: llvm-static -BuildRequires: libffi-devel +BuildRequires: llvm-static libffi-devel %endif +Requires: %{name}-std-static = %{EVR} /usr/bin/cc Provides: rustc = %{EVR} -Provides: rustc = %{EVR} - -Requires: %{name}-std-static = %{EVR} -Requires: /usr/bin/cc - -%global __ranlib %{_bindir}/ranlib - -%global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.* -%global __provides_exclude ^(%{_privatelibs})$ -%global __requires_exclude ^(%{_privatelibs})$ -%global __provides_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ -%global __requires_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$ - -%global _find_debuginfo_opts --keep-section .rustc -%if %{without bootstrap} -%bcond_without llvm_has_filecheck +%if %{without wasm} +Obsoletes: rust-std-static-wasm32-wasi < %{EVR} +Obsoletes: rust-std-static-wasm32-unknown-unknown < %{EVR} %endif -%global common_libdir %{_prefix}/lib -%global rustlibdir %{common_libdir}/rustlib - -%ifarch x86_64 -BuildRequires: clang -BuildRequires: lld +%if %{with wasm} +BuildRequires: clang lld %global __os_install_post \ %__os_install_post \ find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)' -print -exec '%{llvm_root}/bin/llvm-ranlib' '{}' ';' \ @@ -151,117 +118,53 @@ find '%{buildroot}%{rustlibdir}'/wasm*/lib -type f -regex '.*\\.\\(a\\|rlib\\)' %endif %description -Rust is a systems programming language that runs blazingly fast, prevents -segfaults, and guarantees thread safety. -This package includes the Rust compiler and documentation generator. +Rust is blazingly fast and memory-efficient: with no runtime or garbage collector, +it can power performance-critical services, run on embedded devices, and easily +integrate with other languages. - -%package std-static -Summary: Standard library for Rust -Provides: %{name}-std-static-%{rust_triple} = %{EVR} +%package -n cargo +Summary: Rust's package manager and build tool Requires: %{name} = %{EVR} -Requires: glibc-devel >= 2.17 - -%description std-static -This package includes the standard libraries for building applications -written in Rust. - -%if %defined wasm_targets -%{lua: do - for triple in string.gmatch(rpm.expand("%{wasm_targets}"), "%S+") do - local subs = { - triple = triple, - name = rpm.expand("%{name}"), - verrel = rpm.expand("%{EVR}"), - wasi = string.find(triple, "-wasi") and 1 or 0, - } - local s = string.gsub([[ - -%package std-static-{{triple}} -Summary: Standard library for Rust {{triple}} -BuildArch: noarch -Requires: {{name}} = {{verrel}} -Requires: lld >= 8.0 -%if {{wasi}} -Provides: bundled(wasi-libc) -%endif - -%description std-static-{{triple}} -This package includes the standard libraries for building applications -written in Rust for the WebAssembly target {{triple}}. - -]], "{{(%w+)}}", subs) - print(s) - end -end} +Provides: cargo-vendor = %{EVR} +Obsoletes: cargo-vendor < %{EVR} +%if %{with bundled_libgit2} +Provides: bundled(libgit2) = %{ligbit2_version} %endif +%description -n cargo +Cargo is a tool that allows Rust projects to declare their various dependencies +and ensure that you'll always get a repeatable build. -%package debugger-common -Summary: Common debugger pretty printers for Rust -BuildArch: noarch +%package -n rustfmt +Summary: Tool to find and fix Rust formatting issues +Requires: cargo +Provides: rustfmt-preview = %{EVR} +Obsoletes: rustfmt-preview < %{EVR} -%description debugger-common -This package includes the common functionality for %{name}-gdb and %{name}-lldb. +%description -n rustfmt +A tool for formatting Rust code according to style guidelines. %package gdb Summary: GDB pretty printers for Rust +Requires: %{name}-debugger-common = %{EVR} gdb BuildArch: noarch -Requires: gdb -Requires: %{name}-debugger-common = %{EVR} %description gdb This package includes the rust-gdb script, which allows easier debugging of Rust programs. - %if %{with lldb} %package lldb Summary: LLDB pretty printers for Rust -BuildArch: noarch Requires: lldb python3-lldb Requires: %{name}-debugger-common = %{EVR} +BuildArch: noarch %description lldb This package includes the rust-lldb script, which allows easier debugging of Rust programs. - %endif - -%package doc -Summary: Documentation for Rust -Requires: %{name} = %{EVR} -Provides: cargo-doc = %{EVR} -Obsoletes: cargo-doc < %{EVR} - -%description doc -This package includes HTML documentation for the Rust programming language and -its standard library. - -%package -n cargo -Summary: Rust's package manager and build tool -Requires: %{name} = %{EVR} -Provides: cargo-vendor = %{EVR} -Obsoletes: cargo-vendor < %{EVR} -%if %{with bundled_libgit2} -Provides: bundled(libgit2) = %{ligbit2_version} -%endif - -%description -n cargo -Cargo is a tool that allows Rust projects to declare their various dependencies -and ensure that you'll always get a repeatable build. - - -%package -n rustfmt -Summary: Tool to find and fix Rust formatting issues -Requires: cargo -Provides: rustfmt-preview = %{EVR} -Obsoletes: rustfmt-preview < %{EVR} - -%description -n rustfmt -A tool for formatting Rust code according to style guidelines. - %package analyzer Summary: Rust implementation of the Language Server Protocol Recommends: %{name}-src = %{EVR} @@ -272,7 +175,6 @@ rust-analyzer is an implementation of Language Server Protocol for the Rust programming language. It provides features like completion and goto definition for many code editors, including VS Code, Emacs and Vim. - %package -n clippy Summary: Lints to catch common mistakes and improve your Rust code Requires: cargo %{name} = %{EVR} @@ -282,17 +184,15 @@ Obsoletes: clippy-preview < %{EVR} %description -n clippy A collection of lints to catch common mistakes and improve your Rust code. - %package src Summary: Sources for the Rust standard library -BuildArch: noarch Recommends: %{name}-std-static = %{EVR} +BuildArch: noarch %description src This package includes source files for the Rust standard library. It may be useful as a reference for code completion tools in various editors. - %package analysis Summary: Compiler analysis data for the Rust standard library Recommends: %{name}-std-static = %{EVR} @@ -311,38 +211,89 @@ Buildarch: noarch This is the metapackage for Rust Toolset, bringing in the Rust compiler, the Cargo package manager, and a few convenience macros for rpm builds. +%package std-static +Summary: Standard library for Rust +Requires: %{name} = %{EVR} +Requires: glibc-devel >= 2.17 +Provides: %{name}-std-static-%{rust_triple} = %{EVR} + +%description std-static +This package includes the standard libraries for building applications +written in Rust. + +%if %{with wasm} +%package std-static-wasm32-unknown-unknown +Summary: Standard library for Rust wasm32-unknown-unknown +Requires: %{name} = %{EVR} lld >= 8.0 +BuildArch: noarch + +%description std-static-wasm32-unknown-unknown +This package includes the standard libraries for building applications +written in Rust for the WebAssembly target wasm32-unknown-unknown + +%package std-static-wasm32-wasi +Summary: Standard library for Rust wasm32-wasi +Requires: %{name} = %{EVR} lld >= 8.0 +Provides: bundled(wasi-libc) +BuildArch: noarch + +%description std-static-wasm32-wasi +This package includes the standard libraries for building applications +written in Rust for the WebAssembly target wasm32-wasi +%endif + +%package debugger-common +Summary: Common debugger pretty printers for Rust +BuildArch: noarch + +%description debugger-common +This package includes the common functionality for %{name}-gdb and %{name}-lldb. + +%package doc +# This package can not set the noarch +Summary: Documentation for Rust +Requires: %{name} = %{EVR} +Provides: cargo-doc = %{EVR} +Obsoletes: cargo-doc < %{EVR} + +%description doc +This package includes HTML documentation for the Rust programming language and +its standard library. + +%if %{with bootstrap} +%include %{SOURCE4} +%endif + %prep %if %{with bootstrap} rm -rf %{local_rust_root} -%setup -q -n cargo-%{bootstrap_suffix} -T -b %{bootstrap_source_cargo} -./install.sh --prefix=%{local_rust_root} --disable-ldconfig -%setup -q -n rustc-%{bootstrap_suffix} -T -b %{bootstrap_source_rustc} -./install.sh --prefix=%{local_rust_root} --disable-ldconfig -%setup -q -n rust-std-%{bootstrap_suffix} -T -b %{bootstrap_source_std} -./install.sh --prefix=%{local_rust_root} --disable-ldconfig +for d_src in %{bootstrap_source_cargo} %{bootstrap_source_rustc} %{bootstrap_source_std}; do: + %setup -q -n cargo-%{bootstrap_suffix} -T -b %{d_src} + ./install.sh --prefix=%{local_rust_root} --disable-ldconfig +done test -f '%{local_rust_root}/bin/cargo' test -f '%{local_rust_root}/bin/rustc' %endif -%if %defined wasm_targets +%if %{with wasm} %setup -q -n %{wasi_libc_source} -T -b 1 +%patch0005 -p1 %endif %setup -q -n rustc-%{version}-src -%patch1 -p1 -%patch2 -p1 +%patch0001 -p1 +%patch0002 -p1 %if %{without libssh2} -%patch100 -p1 +%patch0003 -p1 %endif %if %{without curl_http2} -%patch101 -p1 +%patch0004 -p1 rm -rf vendor/libnghttp2-sys/ %endif sed -i.try-python -e '/^try python3 /i try "%{__python3}" "$@"' ./configure - sed -i.rust-src -e "s#@BUILDDIR@#$PWD#" ./src/etc/rust-gdb %if %{without bootstrap} @@ -350,15 +301,6 @@ rm -rf src/llvm-project/ mkdir -p src/llvm-project/libunwind/ %endif -rm -rf vendor/curl-sys/curl/ -rm -rf vendor/*jemalloc-sys*/jemalloc/ -rm -rf vendor/libmimalloc-sys/c_src/mimalloc/ -rm -rf vendor/libssh2-sys/libssh2/ -rm -rf vendor/libz-sys/src/zlib/ -rm -rf vendor/libz-sys/src/zlib-ng/ -rm -rf vendor/lzma-sys/xz-*/ -rm -rf vendor/openssl-src/openssl/ - %if %{without bundled_libgit2} rm -rf vendor/libgit2-sys/libgit2/ %endif @@ -367,6 +309,17 @@ rm -rf vendor/libgit2-sys/libgit2/ rm -rf vendor/libssh2-sys/ %endif +pushd vendor +rm -rf curl-sys/curl/ +rm -rf *jemalloc-sys*/jemalloc/ +rm -rf libmimalloc-sys/c_src/mimalloc/ +rm -rf libssh2-sys/libssh2/ +rm -rf libz-sys/src/zlib/ +rm -rf libz-sys/src/zlib-ng/ +rm -rf lzma-sys/xz-*/ +rm -rf openssl-src/openssl/ +popd + sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs %if %{without bootstrap} && %{with static} @@ -392,7 +345,6 @@ find -name '*.rs' -type f -perm /111 -exec chmod -v -x '{}' '+' %endif %global export_rust_env %{?rust_env:export %{rust_env}} - %build %{export_rust_env} @@ -402,67 +354,61 @@ if [ "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ]; then ncpus="$max_cpus" fi -%configure --disable-option-checking \ - --libdir=%{common_libdir} \ +%if %{with wasm} +%make_build --quiet -C %{wasi_libc_dir} CC=clang AR=llvm-ar NM=llvm-nm +%endif + +%configure --disable-option-checking --libdir=%{common_libdir} \ --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \ - --set target.%{rust_triple}.linker=%{__cc} \ - --set target.%{rust_triple}.cc=%{__cc} \ - --set target.%{rust_triple}.cxx=%{__cxx} \ - --set target.%{rust_triple}.ar=%{__ar} \ + --set target.%{rust_triple}.linker=%{__cc} --set target.%{rust_triple}.cc=%{__cc} \ + --set target.%{rust_triple}.cxx=%{__cxx} --set target.%{rust_triple}.ar=%{__ar} \ --set target.%{rust_triple}.ranlib=%{__ranlib} \ -%ifarch x86_64 +%if %{with wasm} --set target.wasm32-wasi.wasi-root=%{wasi_libc_dir}/sysroot \ %endif - %{?wasm_target_config} \ - --python=%{__python3} \ - --local-rust-root=%{local_rust_root} \ - --set build.rustfmt=/bin/true \ + %{?wasm_target_config} --python=%{__python3} --local-rust-root=%{local_rust_root} \ + --set build.rustfmt=/bin/true --disable-llvm-static-stdcpp \ %if %{without bootstrap} --llvm-root=%{llvm_root} \ %endif %if %{without llvm_has_filecheck} --disable-codegen-tests \ %endif -%if %{with static} +%if %{without static} --enable-llvm-link-shared \ %endif - --disable-llvm-static-stdcpp \ - --disable-rpath \ %if %{with debug} --debuginfo-level=2 \ %endif - --set rust.codegen-units-std=1 \ - --set build.build-stage=2 \ - --set build.doc-stage=2 \ - --set build.install-stage=2 \ - --set build.test-stage=2 \ - --enable-extended \ + --set rust.codegen-units-std=1 --set build.build-stage=2 \ + --set build.doc-stage=2 --set build.install-stage=2 \ + --set build.test-stage=2 --enable-extended \ --tools=analysis,cargo,clippy,rls,rust-analyzer,rustfmt,src \ - --enable-vendor \ - --enable-verbose-tests \ - --dist-compression-formats=gz \ - --release-channel=%{channel} \ + --enable-vendor --enable-verbose-tests --dist-compression-formats=gz \ + --disable-rpath --release-channel=%{channel}\ --release-description="Anolis %{anolis_ver} %{EVR}" %{__python3} ./x.py build -j "$ncpus" %{__python3} ./x.py doc +%if %{with wasm} for triple in %{?wasm_targets}; do %{__python3} ./x.py build --target=$triple std done +%endif %install %{export_rust_env} DESTDIR=%{buildroot} %{__python3} ./x.py install +%if %{with wasm} for triple in %{?wasm_targets}; do DESTDIR=%{buildroot} %{__python3} ./x.py install --target=$triple std done +%endif -%{__install} -t %{buildroot}%{_bindir} build/%{rust_triple}/stage2-tools-bin/rls - -rm -rf ./build/dist/ ./build/tmp/ +install -t %{buildroot}%{_bindir} build/%{rust_triple}/stage2-tools-bin/rls %if "%{_libdir}" != "%{common_libdir}" mkdir -p %{buildroot}%{_libdir} @@ -473,7 +419,8 @@ find %{buildroot}%{common_libdir} -maxdepth 1 -type f -name '*.so' \ find %{buildroot}%{_libdir} -maxdepth 1 -type f -name '*.so' \ -exec chmod -v +x '{}' '+' -find %{buildroot}%{rustlibdir}/%{rust_triple}/lib/ -maxdepth 1 -type f -name '*.so' | +pushd %{buildroot}%{rustlibdir} +find lib -maxdepth 1 -type f -name '*.so' | while read lib; do lib2="%{buildroot}%{_libdir}/${lib##*/}" if [ -f "$lib2" ]; then @@ -481,14 +428,17 @@ while read lib; do ln -v -f -r -s -T "$lib2" "$lib" fi done - -find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+' -find %{buildroot}%{rustlibdir} -type f -name '*.orig' -exec rm -v '{}' '+' -find %{buildroot}%{rustlibdir}/src -type f -name '*.py' -exec rm -v '{}' '+' - -for d_file in README.md COPYRIGHT LICENSE* *.old html; do: - rm -rf %{buildroot}%{_docdir}/%{d_file} -done +find ./ -maxdepth 1 -type f -exec rm -v '{}' '+' +find ./ -type f -name '*.orig' -exec rm -v '{}' '+' +find src -type f -name '*.py' -exec rm -v '{}' '+' +popd + +pushd %{buildroot} +install -m 0644 -D -p %{SOURCE100} ./%{rpmmacrodir}/macros.rust-toolset +install -m 0644 -D -p %{SOURCE101} ./%{_sysconfdir}/skel/.cargo/config.toml +install -m 0644 -D -p %{SOURCE102} ./%{_sysconfdir}/profile.d/cargo-config.sh +install -m 0644 -D -p %{SOURCE103} ./%{_sysconfdir}/profile.d/cargo-config.csh +popd mkdir -p %{buildroot}%{_datadir}/cargo/registry mkdir -p %{buildroot}%{_docdir}/cargo @@ -499,12 +449,11 @@ rm -f %{buildroot}%{_bindir}/rust-lldb rm -f %{buildroot}%{rustlibdir}/etc/lldb_* %endif +rm -rf ./build/dist/ ./build/tmp/ rm -f %{buildroot}%{rustlibdir}/%{rust_triple}/bin/rust-ll* - -%{__install} -D -m 644 %{SOURCE100} %{buildroot}%{rpmmacrodir}/macros.rust-toolset -%{__install} -D -m 644 %{SOURCE101} %{buildroot}%{_sysconfdir}/skel/.cargo/config.toml -%{__install} -D -m 644 %{SOURCE102} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.sh -%{__install} -D -m 644 %{SOURCE103} %{buildroot}%{_sysconfdir}/profile.d/cargo-config.csh +rm -rf %{buildroot}%{_docdir}/%{name}/README* +rm -rf %{buildroot}%{_docdir}/%{name}/LICENSE* +rm -rf %{buildroot}%{_docdir}/%{name}/COPYRIGHT %check %{export_rust_env} @@ -514,19 +463,22 @@ env RUSTC=%{buildroot}%{_bindir}/rustc \ LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" \ %{buildroot}%{_bindir}/cargo run --manifest-path build/hello-world/Cargo.toml +%if %{with wasm} for triple in %{?wasm_targets}; do env RUSTC=%{buildroot}%{_bindir}/rustc \ LD_LIBRARY_PATH="%{buildroot}%{_libdir}:$LD_LIBRARY_PATH" \ %{buildroot}%{_bindir}/cargo build --manifest-path build/hello-world/Cargo.toml --target=$triple done +%endif %{__python3} ./x.py test --no-fail-fast || : rm -rf "./build/%{rust_triple}/test/" %{__python3} ./x.py test --no-fail-fast cargo || : rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" -%{__python3} ./x.py test --no-fail-fast clippy || : -%{__python3} ./x.py test --no-fail-fast rust-analyzer || : -%{__python3} ./x.py test --no-fail-fast rustfmt || : + +for d_modle in clippy rust-analyzer rustfmt; do + %{__python3} ./x.py test --no-fail-fast %{d_modle} || : +done %files %license COPYRIGHT LICENSE-APACHE LICENSE-MIT @@ -541,69 +493,6 @@ rm -rf "./build/%{rust_triple}/stage2-tools/%{rust_triple}/cit/" %dir %{rustlibdir}/%{rust_triple}/lib %{rustlibdir}/%{rust_triple}/lib/*.so -%files std-static -%dir %{rustlibdir} -%dir %{rustlibdir}/%{rust_triple} -%dir %{rustlibdir}/%{rust_triple}/lib -%{rustlibdir}/%{rust_triple}/lib/*.rlib - -%ifarch x86_64 -%{lua: do - for triple in string.gmatch(rpm.expand("%{wasm_targets}"), "%S+") do - local subs = { - triple = triple, - rustlibdir = rpm.expand("%{rustlibdir}"), - wasi = string.find(triple, "-wasi") and 1 or 0, - } - local s = string.gsub([[ - -%files std-static-{{triple}} -%dir {{rustlibdir}} -%dir {{rustlibdir}}/{{triple}} -%dir {{rustlibdir}}/{{triple}}/lib -{{rustlibdir}}/{{triple}}/lib/*.rlib -%if {{wasi}} -%dir {{rustlibdir}}/{{triple}}/lib/self-contained -{{rustlibdir}}/{{triple}}/lib/self-contained/crt*.o -{{rustlibdir}}/{{triple}}/lib/self-contained/libc.a -%endif - -]], "{{(%w+)}}", subs) - print(s) - end -end} -%endif - - -%files debugger-common -%dir %{rustlibdir} -%dir %{rustlibdir}/etc -%{rustlibdir}/etc/rust_*.py* - - -%files gdb -%{_bindir}/rust-gdb -%{rustlibdir}/etc/gdb_* -%exclude %{_bindir}/rust-gdbgui - - -%if %with lldb -%files lldb -%{_bindir}/rust-lldb -%{rustlibdir}/etc/lldb_* -%endif - - -%files doc -%doc README.md -%docdir %{_docdir}/%{name} -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/html -%docdir %{_docdir}/cargo -%dir %{_docdir}/cargo -%{_docdir}/cargo/html - - %files -n cargo %license src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY} %doc src/tools/cargo/README.md @@ -617,39 +506,79 @@ end} %dir %{_datadir}/cargo %dir %{_datadir}/cargo/registry - %files -n rustfmt %{_bindir}/rustfmt %{_bindir}/cargo-fmt -%doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md -%license src/tools/rustfmt/LICENSE-{APACHE,MIT} +%files gdb +%{_bindir}/rust-gdb +%{rustlibdir}/etc/gdb_* +%exclude %{_bindir}/rust-gdbgui + +%if %{with lldb} +%files lldb +%{_bindir}/rust-lldb +%{rustlibdir}/etc/lldb_* +%endif %files analyzer %{_bindir}/rls %{_bindir}/rust-analyzer -%doc src/tools/rust-analyzer/README.md -%license src/tools/rust-analyzer/LICENSE-{APACHE,MIT} - %files -n clippy %{_bindir}/cargo-clippy %{_bindir}/clippy-driver -%doc src/tools/clippy/{README.md,CHANGELOG.md} -%license src/tools/clippy/LICENSE-{APACHE,MIT} - %files src %dir %{rustlibdir} %{rustlibdir}/src - %files analysis %{rustlibdir}/%{rust_triple}/analysis/ %files toolset %{rpmmacrodir}/macros.rust-toolset +%files std-static +%dir %{rustlibdir} +%dir %{rustlibdir}/%{rust_triple} +%dir %{rustlibdir}/%{rust_triple}/lib +%{rustlibdir}/%{rust_triple}/lib/*.rlib + +%if %{with wasm} +%files std-static-wasm32-unknown-unknown +%dir %{rustlibdir} +%dir %{rustlibdir}/wasm32-unknown-unknown +%dir %{rustlibdir}/wasm32-unknown-unknown/lib +%{rustlibdir}/wasm32-unknown-unknown/lib/*.rlib + +%files std-static-wasm32-wasi +%dir %{rustlibdir} +%dir %{rustlibdir}/wasm32-wasi +%dir %{rustlibdir}/wasm32-wasi/lib +%dir %{rustlibdir}/wasm32-wasi/lib/self-contained +%{rustlibdir}/wasm32-wasi/lib/*.rlib +%{rustlibdir}/wasm32-wasi/lib/self-contained/crt*.o +%{rustlibdir}/wasm32-wasi/lib/self-contained/libc.a +%endif + +%files debugger-common +%dir %{rustlibdir} +%dir %{rustlibdir}/etc +%{rustlibdir}/etc/rust_*.py* + +%files doc +%doc README.md +%docdir %{_docdir}/%{name} +%dir %{_docdir}/%{name} +%{_docdir}/%{name}/html +%docdir %{_docdir}/cargo +%dir %{_docdir}/cargo +%{_docdir}/cargo/html +%doc src/tools/clippy/{README.md,CHANGELOG.md} +%doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md +%doc src/tools/rust-analyzer/README.md + %changelog * Tue Apr 18 2023 happy_orange - 1.68.2-3 - optimise spec file -- Gitee