diff --git a/0001-Only-dist-llvm-objcopy-if-llvm-tools-are-enabled.patch b/0001-Only-dist-llvm-objcopy-if-llvm-tools-are-enabled.patch new file mode 100644 index 0000000000000000000000000000000000000000..ff572170500fa493908cd7966978bd4e423e4ec6 --- /dev/null +++ b/0001-Only-dist-llvm-objcopy-if-llvm-tools-are-enabled.patch @@ -0,0 +1,25 @@ +From 4c6d793c66993a0f5455f35e73a1549d232c3ae5 Mon Sep 17 00:00:00 2001 +From: Josh Stone +Date: Thu, 12 Dec 2024 17:06:03 -0800 +Subject: [PATCH] Only dist `llvm-objcopy` if llvm tools are enabled + +--- + src/bootstrap/src/core/build_steps/dist.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs +index 0c739115165e..89b2d73f74a8 100644 +--- a/src/bootstrap/src/core/build_steps/dist.rs ++++ b/src/bootstrap/src/core/build_steps/dist.rs +@@ -471,7 +471,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) { + } + } + +- { ++ if builder.config.llvm_enabled(compiler.host) && builder.config.llvm_tools_enabled { + let src_dir = builder.sysroot_target_bindir(compiler, host); + let llvm_objcopy = exe("llvm-objcopy", compiler.host); + let rust_objcopy = exe("rust-objcopy", compiler.host); +-- +2.47.1 + diff --git a/0001-fix-build-error-for-loongarch64.patch b/0001-fix-build-error-for-loongarch64.patch index 48e1b2485c78f0c50aa0ee49ec4c8c041577aaf6..20d9cf275bcaf1eda365caba625991de4fe8e099 100644 --- a/0001-fix-build-error-for-loongarch64.patch +++ b/0001-fix-build-error-for-loongarch64.patch @@ -1,5 +1,5 @@ ---- a/vendor/compiler_builtins-0.1.133/configure.rs -+++ b/vendor/compiler_builtins-0.1.133/configure.rs +--- a/vendor/compiler_builtins-0.1.138/configure.rs ++++ b/vendor/compiler_builtins-0.1.138/configure.rs @@ -72,6 +72,8 @@ pub fn configure_f16_f128(target: &Target) { "sparc" | "sparcv9" => (true, false), // `f16` miscompiles diff --git a/rust.spec b/rust.spec index 69c1d5b27282cc2d538c71b51dc0e133a446115a..e24b742d95449e3435d1db29593840fd4a5cd739 100644 --- a/rust.spec +++ b/rust.spec @@ -22,7 +22,7 @@ %endif Name: rust -Version: 1.83.0 +Version: 1.84.0 Release: 1 Summary: The Rust Programming Language License: Apache-2.0 OR MIT @@ -35,13 +35,15 @@ Source3: cargo-config Source4: cargo-config.sh Source5: cargo-config.csh -Patch0000: rustc-1.82.0-disable-libssh2.patch +Patch0000: rustc-1.84.0-disable-libssh2.patch # By default, rust tries to use "rust-lld" as a linker for some targets. Patch0001: 0001-Use-lld-provided-by-system.patch # Set a substitute-path in rust-gdb for standard library sources. Patch0002: rustc-1.70.0-rust-gdb-substitute-path.patch Patch0003: 0001-add-support-for-ppc64le.patch -Patch0005: 0001-fix-build-error-for-loongarch64.patch +Patch0004: 0001-fix-build-error-for-loongarch64.patch +# https://github.com/rust-lang/rust/pull/134240 +Patch0005: 0001-Only-dist-llvm-objcopy-if-llvm-tools-are-enabled.patch %{lua: function rust_triple(arch) local abi = "gnu" @@ -256,13 +258,11 @@ Obsoletes: %{name}-doc < %{version}-%{release} %{name}-cargo-doc < %{version}- Man pages and other related help documents for rust. %prep -# download source0 and gpg check -#wget -qO %{SOURCE0} https://user-repo.openeuler.openatom.cn/lfs-tar/rust/rustc-%{version}-src.tar.xz +# gpg check gpg --import %{SOURCE2} gpg --verify %{SOURCE1} %{SOURCE0} %ifarch %{bootstrap_arches} -#wget -qO %{_sourcedir}/%{bootstrap_root}.tar.xz https://user-repo.openeuler.openatom.cn/lfs-tar/rust/%{bootstrap_root}.tar.xz %setup -q -n %{bootstrap_root} -T -b %{bootstrap_source} ./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \ --prefix=%{local_rust_root} --disable-ldconfig @@ -279,6 +279,7 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure %patch -P 0001 -p1 %patch -P 0002 -p1 %patch -P 0003 -p1 +%patch -P 0004 -p1 %patch -P 0005 -p1 rm -rf vendor/curl-sys*/curl/ rm -rf vendor/jemalloc-sys/jemalloc/ @@ -471,6 +472,7 @@ export %{rust_env} %dir %{rustlibdir}/%{rust_triple} %dir %{rustlibdir}/%{rust_triple}/lib %{rustlibdir}/%{rust_triple}/lib/*.rlib +%{rustlibdir}/%{rust_triple}/bin/rust-objcopy %if %{with musl_target} %dir %{rustlibdir}/%{rust_musl_triple} %dir %{rustlibdir}/%{rust_musl_triple}/lib @@ -543,6 +545,9 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Wed Jan 15 2025 wangkai <13474090681@163.com> - 1.84.0-1 +- Update to 1.84.0 + * Mon Dec 09 2024 wangkai <13474090681@163.com> - 1.83.0-1 - Update to 1.83.0 - Switch loongarch64 arch to bootstrap diff --git a/rustc-1.83.0-src.tar.xz.asc b/rustc-1.83.0-src.tar.xz.asc deleted file mode 100644 index c4e662634c79cccd42ba878e1290b03937e03f80..0000000000000000000000000000000000000000 --- a/rustc-1.83.0-src.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -wsFcBAABCgAQBQJnSHLqCRCFq5bm+hvl/gAAe54P/39kd/k6ZXxUwH115gHRGDbB -k4jBGolmSDNmapCOa0Or75ykRVvRUfuP9OLNRn4PbDx69g3TA3/Sw7LZ6kepwtnD -C0e+PP+CrRhc/5HJBGdl7WJUEwRciPV36gsuXQwSTfQiSj8z/70yAMjxBPT7e7Iv -YapeVEZ9DnlEdfURCOYgUNGupwe5NVqXLl5WTGzFXBlIRuQvYC6mAsgtP0XXw5ou -kMdXqOGtKlqbAw9oFr1nU9i2G5h5b3sEOtn1mlGSZTk191FTT4lCwWsoy967omhc -3JFt6j6JW1WymT9pN83TN+qBrWBws6hiJBi5W7Hkpd7GsTVMNSoExKkRDSw9lxtN -xFA4VoAl88JC6FZYQNoxZ2Xm86S5APLlNlaJDFGu1pErQmvk1nXaU8nY29zxo8J3 -TlmxGj4ksaqTa/qLyVmfAciHPJEKuhFdX7at9Ld25KV2DOOp4ZCsYC8a2kdlZi0q -+EnZUIZiFci1z/uYEZZCVEZ6QLPEyF6an4n4SPvu5yXtlYUFskKsrSIOT8Ln/QbC -cRY/mrIJV2z0lUQSrTg3BW0o1cCdqyZ2acUGuvjawYZkk0hk/UBYibW5vOkmg6aw -2vJhmjaWV5f+J24v2NsbMFOHlnybz6EBsvxjOA/l2UMgmzqeg0ZJWrjsk3EjBGtu -TJ1hlJjFE5rRYnVrf6ud -=tqIR ------END PGP SIGNATURE----- diff --git a/rustc-1.82.0-disable-libssh2.patch b/rustc-1.84.0-disable-libssh2.patch similarity index 64% rename from rustc-1.82.0-disable-libssh2.patch rename to rustc-1.84.0-disable-libssh2.patch index 69f5704e872868b342f3baaa206b56cb471ae554..267bc3ca4f677e61e32f0ebe96a888857239ce47 100644 --- a/rustc-1.82.0-disable-libssh2.patch +++ b/rustc-1.84.0-disable-libssh2.patch @@ -1,7 +1,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools/cargo/Cargo.lock ---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-09-06 10:36:55.743405666 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-09-06 10:36:55.745405652 -0700 -@@ -2156,7 +2156,6 @@ checksum = "10472326a8a6477c3c20a64547b0 +--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig 2024-12-12 14:07:10.755481543 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-12-12 14:07:10.756481534 -0800 +@@ -2272,7 +2272,6 @@ checksum = "10472326a8a6477c3c20a64547b0 dependencies = [ "cc", "libc", @@ -9,7 +9,7 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools "libz-sys", "openssl-sys", "pkg-config", -@@ -2197,20 +2196,6 @@ dependencies = [ +@@ -2313,20 +2312,6 @@ dependencies = [ "pkg-config", "vcpkg", ] @@ -31,14 +31,14 @@ diff -up rustc-beta-src/src/tools/cargo/Cargo.lock.orig rustc-beta-src/src/tools [[package]] name = "libz-sys" diff -up rustc-beta-src/src/tools/cargo/Cargo.toml.orig rustc-beta-src/src/tools/cargo/Cargo.toml ---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-09-06 10:36:55.746405645 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-09-06 10:37:13.849280464 -0700 -@@ -44,7 +44,7 @@ curl = "0.4.46" +--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig 2024-12-12 14:07:10.756481534 -0800 ++++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-12-12 14:07:56.866087428 -0800 +@@ -47,7 +47,7 @@ curl = "0.4.46" curl-sys = "0.4.73" filetime = "0.2.23" flate2 = { version = "1.0.30", default-features = false, features = ["zlib"] } -git2 = "0.19.0" +git2 = { version = "0.19.0", default-features = false, features = ["https"] } git2-curl = "0.20.0" - gix = { version = "0.64.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } + gix = { version = "0.67.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "parallel", "dirwalk"] } glob = "0.3.1" diff --git a/rustc-1.83.0-src.tar.xz b/rustc-1.84.0-src.tar.xz similarity index 32% rename from rustc-1.83.0-src.tar.xz rename to rustc-1.84.0-src.tar.xz index 62e6a4fbc5168a5b41fe9a63ced0fd48720765d3..4bb8ce101355f416c415ce4b9ad9b56d42189b98 100644 --- a/rustc-1.83.0-src.tar.xz +++ b/rustc-1.84.0-src.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df -size 353808388 +oid sha256:bc2c1639f26814c7b17a323992f1e08c3b01fe88cdff9a27d951987d886e00b3 +size 354993944 diff --git a/rustc-1.84.0-src.tar.xz.asc b/rustc-1.84.0-src.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..157cf005640afafdb6a993ac9a2a3b48103850b3 --- /dev/null +++ b/rustc-1.84.0-src.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +wsFcBAABCgAQBQJnf+jmCRCFq5bm+hvl/gAAWrEQAMg3RDwgF0PZwgxJrF4+l6hS +d2PsPWHmosvgOYNYSievMcP4obna2lCCQeoV32a1OeyzcrrTXLzxi+d4GlXYncoE +4mdvVrGczEmg9U3vSeso+CsdCvk8D/RFghQa0biamrVe3bbRZcaf8Xv9X2nkoOPc +W5A9rpYetZzS1PAslb1W+ox1qzu9LwKiUBf6dC8OMmM4Fha7iNCFyovk6ddlNpRn +sK38Dy8rQEHQ25bSp3wGKIVeoA4sGGod6wv3ogf2SjJejX4aGQ10On3RtUQ2IzUJ +C3a1X9RHIa1xat/cS9sUja1cJn8swoC91Ruql/LS6KrU7IPbODlq2V7XDtzJN5r2 +JcIuQEQ7haEsy7A5sToIq7l6kbh8khNVzAT0w6BAnSj8nKJYkiyCUHZoXMAJx5cp +2JI3QXlcKfa4Iye4Eskc80oOrZXg68oF+URC3lB1DL5g53UCzXO3Og57BW5CEk/V +/La4USdNXhhy09pggqoZN7wTRNs8FLih+4RZhNdscNGgha7CDdcf5+yuv+j7QbEl +//gnOwC+kBJ38U7CrgcDIVw3a2VchQYPp36ytz+wNJn9dgDd+Djr7XldaMmucYvR +8tE8Bq7tGXjhV9nW/d24rSaBZZjt8rpWOd7DBvyR6GKZQh/uIWyortEDjf8vLz3c +727DfkDu6NYOkUP0tcf3 +=1H36 +-----END PGP SIGNATURE-----