diff --git a/.gitignore b/.gitignore index f6eaab1..8ecc16b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,17 @@ SOURCES/rustc-1.92.0-src.tar.xz SOURCES/wasi-libc-wasi-sdk-27.tar.gz +SOURCES/cargo-1.91.0-aarch64-unknown-linux-gnu.tar.xz +SOURCES/cargo-1.91.0-i686-unknown-linux-gnu.tar.xz +SOURCES/cargo-1.91.0-powerpc64le-unknown-linux-gnu.tar.xz +SOURCES/cargo-1.91.0-s390x-unknown-linux-gnu.tar.xz +SOURCES/cargo-1.91.0-x86_64-unknown-linux-gnu.tar.xz +SOURCES/rust-std-1.91.0-aarch64-unknown-linux-gnu.tar.xz +SOURCES/rust-std-1.91.0-i686-unknown-linux-gnu.tar.xz +SOURCES/rust-std-1.91.0-powerpc64le-unknown-linux-gnu.tar.xz +SOURCES/rust-std-1.91.0-s390x-unknown-linux-gnu.tar.xz +SOURCES/rust-std-1.91.0-x86_64-unknown-linux-gnu.tar.xz +SOURCES/rustc-1.91.0-aarch64-unknown-linux-gnu.tar.xz +SOURCES/rustc-1.91.0-i686-unknown-linux-gnu.tar.xz +SOURCES/rustc-1.91.0-powerpc64le-unknown-linux-gnu.tar.xz +SOURCES/rustc-1.91.0-s390x-unknown-linux-gnu.tar.xz +SOURCES/rustc-1.91.0-x86_64-unknown-linux-gnu.tar.xz diff --git a/.rust.metadata b/.rust.metadata index 4515690..0915111 100644 --- a/.rust.metadata +++ b/.rust.metadata @@ -1,2 +1,17 @@ +168930135a786b11c8a613095f17c58e746a3b03 SOURCES/cargo-1.91.0-aarch64-unknown-linux-gnu.tar.xz +d3df0ff8b1a46a9e7bdb966a9b33717eb0dbb80b SOURCES/cargo-1.91.0-i686-unknown-linux-gnu.tar.xz +ecd224329f9630b3c6de930569b0143793a8dea2 SOURCES/cargo-1.91.0-powerpc64le-unknown-linux-gnu.tar.xz +f822606ff2047231d510007dee974f3ba2b8b172 SOURCES/cargo-1.91.0-s390x-unknown-linux-gnu.tar.xz +0f20d0e584b33d1eb8d128c3d3da894537c2d100 SOURCES/cargo-1.91.0-x86_64-unknown-linux-gnu.tar.xz +2199ad3923bf4c64a37a55a9eba278593a50a3b7 SOURCES/rust-std-1.91.0-aarch64-unknown-linux-gnu.tar.xz +8a95d1933a4d759f9b69b2fe61e73f7a8fb51abd SOURCES/rust-std-1.91.0-i686-unknown-linux-gnu.tar.xz +d734487f0197ad15ddb9848018ec1e5efb76d558 SOURCES/rust-std-1.91.0-powerpc64le-unknown-linux-gnu.tar.xz +13f505721e13d4ac6ae264629ade981d06cf882d SOURCES/rust-std-1.91.0-s390x-unknown-linux-gnu.tar.xz +f5ed4aa027acc9c312f2a0811ed7dcce06e2e8a3 SOURCES/rust-std-1.91.0-x86_64-unknown-linux-gnu.tar.xz +597aaa2951aedab02dab03bd0a4b4d86b07288a2 SOURCES/rustc-1.91.0-aarch64-unknown-linux-gnu.tar.xz +f346faaa17e6fdf9648957acf1d0a1fa92f80a00 SOURCES/rustc-1.91.0-i686-unknown-linux-gnu.tar.xz +b453b5a6b932aea4f86d27ba3633f53ab61322a5 SOURCES/rustc-1.91.0-powerpc64le-unknown-linux-gnu.tar.xz +e7c73c79df43936d6946c5897e917cc3111d51b9 SOURCES/rustc-1.91.0-s390x-unknown-linux-gnu.tar.xz +9ef20075f49a5f63c1b66a2049cdf5b587efa6bc SOURCES/rustc-1.91.0-x86_64-unknown-linux-gnu.tar.xz fbabcdb70a1ac1773e63d7800be42ffbaf9286e8 SOURCES/rustc-1.92.0-src.tar.xz 7c12838ff50eb7d07e0679ae4e70b99ca5c711c0 SOURCES/wasi-libc-wasi-sdk-27.tar.gz diff --git a/SPECS/rust.spec b/SPECS/rust.spec index 49cea4d..1131644 100644 --- a/SPECS/rust.spec +++ b/SPECS/rust.spec @@ -23,7 +23,7 @@ ExclusiveArch: %{rust_arches} # 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} +%global bootstrap_arches %{rust_arches} # 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 @@ -88,7 +88,7 @@ ExclusiveArch: %{rust_arches} # Reduce rustc's own debuginfo and optimizations to conserve 32-bit memory. # e.g. https://github.com/rust-lang/rust/issues/45854 -%global reduced_debuginfo 0 +%global reduced_debuginfo 1 %if 0%{?__isa_bits} == 32 %global reduced_debuginfo 1 %endif @@ -896,9 +896,7 @@ mkdir -p "%{profraw}" # We normally use `x.py`, but in this case we invoke the stage 2 compiler and libs # directly to ensure we use the instrumented compiler. env LLVM_PROFILE_FILE="%{profraw}/default_%%m_%%p.profraw" \ - LD_LIBRARY_PATH=$PWD/build/host/stage2/lib \ - RUSTC=$PWD/build/host/stage2/bin/rustc \ - cargo build --manifest-path=src/tools/cargo/Cargo.toml + %{__x} --keep-stage=0 --keep-stage=1 build cargo # Finalize the profile data and clean up the raw files llvm-profdata merge -o "%{profdata}" "%{profraw}" rm -r "%{profraw}" build/%{rust_triple}/stage2*/ @@ -917,6 +915,7 @@ for triple in %{?all_targets} ; do %{__x} build --target=$triple std done +%ifnarch %{bootstrap_arches} # Collect cargo-vendor.txt for each tool and std %{cargo_tree_manifest -n rustc -- -p rustc-main -p rustdoc} %{cargo_tree_manifest -n cargo -m src/tools/cargo} @@ -931,6 +930,7 @@ for triple in %{?all_targets} ; do *) %{cargo_tree_manifest -n std-$triple -m library -f backtrace -t $triple} ;; esac done +%endif %install %if 0%{?rhel} && 0%{?rhel} <= 9 @@ -1092,7 +1092,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_libexecdir}/rust-analyzer-proc-macro-srv %{_mandir}/man1/rustc.1* %{_mandir}/man1/rustdoc.1* +%ifnarch %{bootstrap_arches} %license build/manifests/rustc/cargo-vendor.txt +%endif %license %{_pkgdocdir}/COPYRIGHT.html %license %{_pkgdocdir}/licenses/ %exclude %{_sysconfdir}/target-spec-json-schema.json @@ -1104,7 +1106,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %dir %{rustlibdir}/%{rust_triple}/lib %{rustlibdir}/%{rust_triple}/lib/*.rlib %{rustlibdir}/%{rust_triple}/lib/*.so +%ifnarch %{bootstrap_arches} %license build/manifests/std/cargo-vendor.txt +%endif %license %{_pkgdocdir}/COPYRIGHT-library.html %global target_files() \ @@ -1112,8 +1116,7 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %dir %{rustlibdir} \ %dir %{rustlibdir}/%1 \ %dir %{rustlibdir}/%1/lib \ -%{rustlibdir}/%1/lib/*.rlib \ -%license build/manifests/std-%1/cargo-vendor.txt +%{rustlibdir}/%1/lib/*.rlib %if %target_enabled i686-pc-windows-gnu %target_files i686-pc-windows-gnu @@ -1195,7 +1198,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_datadir}/zsh/site-functions/_cargo %dir %{_datadir}/cargo %dir %{_datadir}/cargo/registry +%ifnarch %{bootstrap_arches} %license build/manifests/cargo/cargo-vendor.txt +%endif %files -n rustfmt @@ -1203,14 +1208,18 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_bindir}/cargo-fmt %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md %license src/tools/rustfmt/LICENSE-{APACHE,MIT} +%ifnarch %{bootstrap_arches} %license build/manifests/rustfmt/cargo-vendor.txt +%endif %files analyzer %{_bindir}/rust-analyzer %doc src/tools/rust-analyzer/README.md %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT} +%ifnarch %{bootstrap_arches} %license build/manifests/rust-analyzer/cargo-vendor.txt +%endif %files -n clippy @@ -1218,7 +1227,9 @@ timeout -v 30m %{__x} test --no-fail-fast rustfmt || : %{_bindir}/clippy-driver %doc src/tools/clippy/{README.md,CHANGELOG.md} %license src/tools/clippy/LICENSE-{APACHE,MIT} +%ifnarch %{bootstrap_arches} %license build/manifests/clippy/cargo-vendor.txt +%endif %files src