From 049d0527f9c76634ca0e9d55c62be53d472b66fe Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Tue, 18 Jun 2024 16:43:12 +0800 Subject: [PATCH] Update to 1.79.0 --- 0001-Fix-2-tests-for-offline-execution.patch | 59 ------- ...the-host-library-path-in-run-make-v2.patch | 79 --------- 0001-add-support-for-ppc64le.patch | 162 ++++++++++++++++++ ...command-lines-failure-caused-by-rust.patch | 27 --- ...nv-split_paths-join_paths-in-runtest.patch | 63 ------- rust.spec | 32 ++-- rustc-1.78.0-src.tar.xz.asc | 16 -- ...atch => rustc-1.79.0-disable-libssh2.patch | 24 +-- ...78.0-src.tar.xz => rustc-1.79.0-src.tar.xz | 0 rustc-1.79.0-src.tar.xz.asc | 16 ++ 10 files changed, 206 insertions(+), 272 deletions(-) delete mode 100644 0001-Fix-2-tests-for-offline-execution.patch delete mode 100644 0001-Set-the-host-library-path-in-run-make-v2.patch create mode 100644 0001-add-support-for-ppc64le.patch delete mode 100644 0001-fix-long-linker-command-lines-failure-caused-by-rust.patch delete mode 100644 0002-Use-env-split_paths-join_paths-in-runtest.patch delete mode 100644 rustc-1.78.0-src.tar.xz.asc rename rustc-1.78.0-disable-libssh2.patch => rustc-1.79.0-disable-libssh2.patch (40%) rename rustc-1.78.0-src.tar.xz => rustc-1.79.0-src.tar.xz (100%) create mode 100644 rustc-1.79.0-src.tar.xz.asc diff --git a/0001-Fix-2-tests-for-offline-execution.patch b/0001-Fix-2-tests-for-offline-execution.patch deleted file mode 100644 index 49688cf..0000000 --- a/0001-Fix-2-tests-for-offline-execution.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 6dda4e006b0d6d7519ac4a9f540566c81e406a8b Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Mon, 22 Apr 2024 16:19:17 -0700 -Subject: [PATCH] Fix 2 tests for offline execution - -In `alt_registry::warn_for_unused_fields`, the second part of the test -runs on `--registry crates-io`, so it needs a local replacement url. - -In `install::install_global_cargo_config`, it was adding to the "config" -file, but the `pkg` before it configured the dummy registry replacement -in "config.toml". So that replacement wasn't actually used, and if you -ran tests online it was trying to install `bar v0.1.1` from the real -registry! The filename is now fixed, and the test double-checks that -we're only trying to install the local `bar v0.0.1`. ---- - tests/testsuite/alt_registry.rs | 4 ++++ - tests/testsuite/install.rs | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs -index e95f2cbaabbd..1fef04e3ae42 100644 ---- a/tests/testsuite/alt_registry.rs -+++ b/tests/testsuite/alt_registry.rs -@@ -1572,7 +1572,11 @@ or use environment variable CARGO_REGISTRIES_ALTERNATIVE_TOKEN", - ) - .run(); - -+ let crates_io = registry::RegistryBuilder::new() -+ .no_configure_token() -+ .build(); - p.cargo("publish --registry crates-io") -+ .replace_crates_io(crates_io.index_url()) - .with_status(101) - .with_stderr( - "\ -diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs -index 89d40ada9543..ef3f4f3ae604 100644 ---- a/tests/testsuite/install.rs -+++ b/tests/testsuite/install.rs -@@ -1981,7 +1981,7 @@ fn install_ignores_unstable_table_in_local_cargo_config() { - fn install_global_cargo_config() { - pkg("bar", "0.0.1"); - -- let config = cargo_home().join("config"); -+ let config = cargo_home().join("config.toml"); - let mut toml = fs::read_to_string(&config).unwrap_or_default(); - - toml.push_str( -@@ -1994,6 +1994,7 @@ fn install_global_cargo_config() { - - cargo_process("install bar") - .with_status(101) -+ .with_stderr_contains("[INSTALLING] bar v0.0.1") - .with_stderr_contains("[..]--target nonexistent[..]") - .run(); - } --- -2.44.0 - diff --git a/0001-Set-the-host-library-path-in-run-make-v2.patch b/0001-Set-the-host-library-path-in-run-make-v2.patch deleted file mode 100644 index b1ed9e1..0000000 --- a/0001-Set-the-host-library-path-in-run-make-v2.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 27593a7ad3796cf3afaf4145275ff20d5aff333f Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Wed, 10 Apr 2024 17:25:10 -0700 -Subject: [PATCH 1/2] Set the host library path in run-make v2 - -When the build is configured with `[rust] rpath = false`, we need to set -`LD_LIBRARY_PATH` (or equivalent) to what would have been the `RPATH`, -so the compiler can find its own libraries. The old `tools.mk` code has -this environment prefixed in the `$(BARE_RUSTC)` variable, so we just -need to wire up something similar for run-make v2. - -This is now set while building each `rmake.rs` itself, as well as in the -`rust-make-support` helpers for `rustc` and `rustdoc` commands. This is -also available in a `set_host_rpath` function for manual commands, like -in the `compiler-builtins` test. - -(cherry picked from commit 8a5409bbdbadb522f25e7e5e3d54b967cb5eee56) ---- - src/tools/compiletest/src/runtest.rs | 6 ++++++ - src/tools/run-make-support/src/lib.rs | 15 +++++++++++++++ - 2 files changed, 21 insertions(+) - -diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs -index 7be0571b1111..3c775ea0651c 100644 ---- a/src/tools/compiletest/src/runtest.rs -+++ b/src/tools/compiletest/src/runtest.rs -@@ -3767,6 +3767,11 @@ fn run_rmake_v2_test(&self) { - debug!(?support_lib_deps); - debug!(?support_lib_deps_deps); - -+ let mut host_dylib_env_paths = String::new(); -+ host_dylib_env_paths.push_str(&cwd.join(&self.config.compile_lib_path).to_string_lossy()); -+ host_dylib_env_paths.push(':'); -+ host_dylib_env_paths.push_str(&env::var(dylib_env_var()).unwrap()); -+ - let res = self.cmd2procres( - Command::new(&self.config.rustc_path) - .arg("-o") -@@ -3787,6 +3792,7 @@ fn run_rmake_v2_test(&self) { - .env("RUSTC", cwd.join(&self.config.rustc_path)) - .env("TMPDIR", &tmpdir) - .env("LD_LIB_PATH_ENVVAR", dylib_env_var()) -+ .env(dylib_env_var(), &host_dylib_env_paths) - .env("HOST_RPATH_DIR", cwd.join(&self.config.compile_lib_path)) - .env("TARGET_RPATH_DIR", cwd.join(&self.config.run_lib_path)) - .env("LLVM_COMPONENTS", &self.config.llvm_components) -diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs -index 674860f8413b..da3efd292b3f 100644 ---- a/src/tools/run-make-support/src/lib.rs -+++ b/src/tools/run-make-support/src/lib.rs -@@ -11,6 +11,7 @@ pub fn out_dir() -> PathBuf { - fn setup_common_build_cmd() -> Command { - let rustc = env::var("RUSTC").unwrap(); - let mut cmd = Command::new(rustc); -+ set_host_rpath(&mut cmd); - cmd.arg("--out-dir").arg(out_dir()).arg("-L").arg(out_dir()); - cmd - } -@@ -157,3 +158,17 @@ pub fn run_fail(bin_name: &str) -> Output { - } - output - } -+ -+/// Set the runtime library path as needed for running the host rustc/rustdoc/etc. -+pub fn set_host_rpath(cmd: &mut Command) { -+ let ld_lib_path_envvar = env::var("LD_LIB_PATH_ENVVAR").unwrap(); -+ cmd.env(&ld_lib_path_envvar, { -+ let mut paths = vec![]; -+ paths.push(PathBuf::from(env::var("TMPDIR").unwrap())); -+ paths.push(PathBuf::from(env::var("HOST_RPATH_DIR").unwrap())); -+ for p in env::split_paths(&env::var(&ld_lib_path_envvar).unwrap()) { -+ paths.push(p.to_path_buf()); -+ } -+ env::join_paths(paths.iter()).unwrap() -+ }); -+} --- -2.44.0 - diff --git a/0001-add-support-for-ppc64le.patch b/0001-add-support-for-ppc64le.patch new file mode 100644 index 0000000..442d0b4 --- /dev/null +++ b/0001-add-support-for-ppc64le.patch @@ -0,0 +1,162 @@ +From 85c7f9262e9d4fbfdaa5d7bc22a85eb5300fcca0 Mon Sep 17 00:00:00 2001 +From: jcf +Date: Wed, 12 Jun 2024 09:14:32 +0000 +Subject: [PATCH] add support for ppc64le + +--- + compiler/rustc_target/src/spec/mod.rs | 2 ++ + .../spec/targets/ppc64le_unknown_freebsd.rs | 23 +++++++++++++++++++ + .../spec/targets/ppc64le_unknown_linux_gnu.rs | 23 +++++++++++++++++++ + .../targets/ppc64le_unknown_linux_musl.rs | 23 +++++++++++++++++++ + src/bootstrap/configure.py | 2 ++ + vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs | 3 +++ + vendor/target-lexicon-0.12.14/src/targets.rs | 3 +++ + 7 files changed, 79 insertions(+) + create mode 100644 compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs + create mode 100644 compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs + create mode 100644 compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs + +diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs +index 291a761..e6e80a1 100644 +--- a/compiler/rustc_target/src/spec/mod.rs ++++ b/compiler/rustc_target/src/spec/mod.rs +@@ -1513,6 +1513,8 @@ supported_targets! { + ("powerpc64-unknown-linux-musl", powerpc64_unknown_linux_musl), + ("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu), + ("powerpc64le-unknown-linux-musl", powerpc64le_unknown_linux_musl), ++ ("ppc64le-unknown-linux-gnu", ppc64le_unknown_linux_gnu), ++ ("ppc64le-unknown-linux-musl", ppc64le_unknown_linux_musl), + ("s390x-unknown-linux-gnu", s390x_unknown_linux_gnu), + ("s390x-unknown-linux-musl", s390x_unknown_linux_musl), + ("sparc-unknown-linux-gnu", sparc_unknown_linux_gnu), +diff --git a/compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs +new file mode 100644 +index 0000000..615bb67 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs +@@ -0,0 +1,23 @@ ++use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions}; ++ ++pub fn target() -> Target { ++ let mut base = base::freebsd::opts(); ++ base.cpu = "ppc64le".into(); ++ base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]); ++ base.max_atomic_width = Some(64); ++ base.stack_probes = StackProbeType::Inline; ++ ++ Target { ++ llvm_target: "ppc64le-unknown-freebsd".into(), ++ metadata: crate::spec::TargetMetadata { ++ description: None, ++ tier: None, ++ host_tools: None, ++ std: None, ++ }, ++ pointer_width: 64, ++ data_layout: "e-m:e-Fn32-i64:64-n32:64".into(), ++ arch: "powerpc64".into(), ++ options: TargetOptions { mcount: "_mcount".into(), ..base }, ++ } ++} +diff --git a/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs +new file mode 100644 +index 0000000..5ff45e2 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs +@@ -0,0 +1,23 @@ ++use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions}; ++ ++pub fn target() -> Target { ++ let mut base = base::linux_gnu::opts(); ++ base.cpu = "ppc64le".into(); ++ base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]); ++ base.max_atomic_width = Some(64); ++ base.stack_probes = StackProbeType::Inline; ++ ++ Target { ++ llvm_target: "ppc64le-unknown-linux-gnu".into(), ++ metadata: crate::spec::TargetMetadata { ++ description: None, ++ tier: None, ++ host_tools: None, ++ std: None, ++ }, ++ pointer_width: 64, ++ data_layout: "e-m:e-Fn32-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(), ++ arch: "powerpc64".into(), ++ options: TargetOptions { mcount: "_mcount".into(), ..base }, ++ } ++} +diff --git a/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs +new file mode 100644 +index 0000000..2b612e7 +--- /dev/null ++++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs +@@ -0,0 +1,23 @@ ++use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions}; ++ ++pub fn target() -> Target { ++ let mut base = base::linux_musl::opts(); ++ base.cpu = "ppc64le".into(); ++ base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]); ++ base.max_atomic_width = Some(64); ++ base.stack_probes = StackProbeType::Inline; ++ ++ Target { ++ llvm_target: "ppc64le-unknown-linux-musl".into(), ++ metadata: crate::spec::TargetMetadata { ++ description: None, ++ tier: None, ++ host_tools: None, ++ std: None, ++ }, ++ pointer_width: 64, ++ data_layout: "e-m:e-Fn32-i64:64-n32:64-S128-v256:256:256-v512:512:512".into(), ++ arch: "powerpc64".into(), ++ options: TargetOptions { mcount: "_mcount".into(), ..base }, ++ } ++} +diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py +index 768aac9..155f21e 100755 +--- a/src/bootstrap/configure.py ++++ b/src/bootstrap/configure.py +@@ -127,6 +127,8 @@ v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root", + "mips64-unknown-linux-muslabi64 install directory") + v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root", + "mips64el-unknown-linux-muslabi64 install directory") ++v("musl-root-ppc64le", "target.ppc64le-unknown-linux-musl.musl-root", ++ "ppc64le-unknown-linux-musl install directory") + v("musl-root-riscv32gc", "target.riscv32gc-unknown-linux-musl.musl-root", + "riscv32gc-unknown-linux-musl install directory") + v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root", +diff --git a/vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs b/vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs +index 1264742..14427a7 100644 +--- a/vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs ++++ b/vendor/openssl-src-111.28.1+1.1.1w/src/lib.rs +@@ -282,6 +282,9 @@ impl Build { + "powerpc64le-unknown-freebsd" => "BSD-generic64", + "powerpc64le-unknown-linux-gnu" => "linux-ppc64le", + "powerpc64le-unknown-linux-musl" => "linux-ppc64le", ++ "ppc64le-unknown-freebsd" => "BSD-generic64", ++ "ppc64le-unknown-linux-gnu" => "linux-ppc64le", ++ "ppc64le-unknown-linux-musl" => "linux-ppc64le", + "riscv64gc-unknown-linux-gnu" => "linux-generic64", + "s390x-unknown-linux-gnu" => "linux64-s390x", + "s390x-unknown-linux-musl" => "linux64-s390x", +diff --git a/vendor/target-lexicon-0.12.14/src/targets.rs b/vendor/target-lexicon-0.12.14/src/targets.rs +index f764b34..e150f84 100644 +--- a/vendor/target-lexicon-0.12.14/src/targets.rs ++++ b/vendor/target-lexicon-0.12.14/src/targets.rs +@@ -1639,6 +1639,9 @@ mod tests { + "powerpc64le-unknown-freebsd", + "powerpc64le-unknown-linux-gnu", + "powerpc64le-unknown-linux-musl", ++ "ppc64le-unknown-freebsd", ++ "ppc64le-unknown-linux-gnu", ++ "ppc64le-unknown-linux-musl", + "powerpc64-ibm-aix", + "powerpc64-unknown-freebsd", + "powerpc64-unknown-linux-gnu", +-- +2.44.0 + diff --git a/0001-fix-long-linker-command-lines-failure-caused-by-rust.patch b/0001-fix-long-linker-command-lines-failure-caused-by-rust.patch deleted file mode 100644 index e2a2a28..0000000 --- a/0001-fix-long-linker-command-lines-failure-caused-by-rust.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f25809d2d33e1141d73487e55fe155f41762aef3 Mon Sep 17 00:00:00 2001 -From: onur-ozkan -Date: Sun, 10 Mar 2024 09:16:24 +0300 -Subject: [PATCH] fix `long-linker-command-lines` failure caused by - `rust.rpath=false` - -Signed-off-by: onur-ozkan ---- - tests/run-make/long-linker-command-lines/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/run-make/long-linker-command-lines/Makefile b/tests/run-make/long-linker-command-lines/Makefile -index f864ea74f4a9..b573038e344a 100644 ---- a/tests/run-make/long-linker-command-lines/Makefile -+++ b/tests/run-make/long-linker-command-lines/Makefile -@@ -1,6 +1,8 @@ - # ignore-cross-compile - include ../tools.mk - -+export LD_LIBRARY_PATH := $(HOST_RPATH_DIR) -+ - all: - $(RUSTC) foo.rs -g -O - RUSTC="$(RUSTC_ORIGINAL)" $(call RUN,foo) --- -2.44.0 - diff --git a/0002-Use-env-split_paths-join_paths-in-runtest.patch b/0002-Use-env-split_paths-join_paths-in-runtest.patch deleted file mode 100644 index b1f9311..0000000 --- a/0002-Use-env-split_paths-join_paths-in-runtest.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 642e12326055268c7605b31e7f91edf8f58e54d4 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Thu, 11 Apr 2024 15:33:44 -0700 -Subject: [PATCH 2/2] Use `env::split_paths`/`join_paths` in runtest - -(cherry picked from commit 7e171c72cbddb0636fa8ce71a0e862486ae72625) ---- - src/tools/compiletest/src/runtest.rs | 31 ++++++++++++++-------------- - 1 file changed, 15 insertions(+), 16 deletions(-) - -diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs -index 3c775ea0651c..852ffa0a62a8 100644 ---- a/src/tools/compiletest/src/runtest.rs -+++ b/src/tools/compiletest/src/runtest.rs -@@ -3767,10 +3767,13 @@ fn run_rmake_v2_test(&self) { - debug!(?support_lib_deps); - debug!(?support_lib_deps_deps); - -- let mut host_dylib_env_paths = String::new(); -- host_dylib_env_paths.push_str(&cwd.join(&self.config.compile_lib_path).to_string_lossy()); -- host_dylib_env_paths.push(':'); -- host_dylib_env_paths.push_str(&env::var(dylib_env_var()).unwrap()); -+ let orig_dylib_env_paths = -+ Vec::from_iter(env::split_paths(&env::var(dylib_env_var()).unwrap())); -+ -+ let mut host_dylib_env_paths = Vec::new(); -+ host_dylib_env_paths.push(cwd.join(&self.config.compile_lib_path)); -+ host_dylib_env_paths.extend(orig_dylib_env_paths.iter().cloned()); -+ let host_dylib_env_paths = env::join_paths(host_dylib_env_paths).unwrap(); - - let res = self.cmd2procres( - Command::new(&self.config.rustc_path) -@@ -3810,19 +3813,15 @@ fn run_rmake_v2_test(&self) { - // Finally, we need to run the recipe binary to build and run the actual tests. - debug!(?recipe_bin); - -- let mut dylib_env_paths = String::new(); -- dylib_env_paths.push_str(&env::var(dylib_env_var()).unwrap()); -- dylib_env_paths.push(':'); -- dylib_env_paths.push_str(&support_lib_path.parent().unwrap().to_string_lossy()); -- dylib_env_paths.push(':'); -- dylib_env_paths.push_str( -- &stage_std_path.join("rustlib").join(&self.config.host).join("lib").to_string_lossy(), -- ); -+ let mut dylib_env_paths = orig_dylib_env_paths.clone(); -+ dylib_env_paths.push(support_lib_path.parent().unwrap().to_path_buf()); -+ dylib_env_paths.push(stage_std_path.join("rustlib").join(&self.config.host).join("lib")); -+ let dylib_env_paths = env::join_paths(dylib_env_paths).unwrap(); - -- let mut target_rpath_env_path = String::new(); -- target_rpath_env_path.push_str(&tmpdir.to_string_lossy()); -- target_rpath_env_path.push(':'); -- target_rpath_env_path.push_str(&dylib_env_paths); -+ let mut target_rpath_env_path = Vec::new(); -+ target_rpath_env_path.push(&tmpdir); -+ target_rpath_env_path.extend(&orig_dylib_env_paths); -+ let target_rpath_env_path = env::join_paths(target_rpath_env_path).unwrap(); - - let mut cmd = Command::new(&recipe_bin); - cmd.current_dir(&self.testpaths.file) --- -2.44.0 - diff --git a/rust.spec b/rust.spec index b2bc8b5..ca16ba9 100644 --- a/rust.spec +++ b/rust.spec @@ -1,7 +1,7 @@ -%global bootstrap_rust 1.77.0 -%global bootstrap_cargo 1.77.0 -%global bootstrap_channel 1.77.0 -%global bootstrap_date 2024-03-21 +%global bootstrap_rust 1.78.0 +%global bootstrap_cargo 1.78.0 +%global bootstrap_channel 1.78.0 +%global bootstrap_date 2024-05-02 %bcond_with llvm_static %bcond_with bundled_llvm %bcond_without bundled_libgit2 @@ -10,7 +10,7 @@ %bcond_without analyzer Name: rust -Version: 1.78.0 +Version: 1.79.0 Release: 1 Summary: The Rust Programming Language License: Apache-2.0 OR MIT @@ -23,18 +23,12 @@ Source3: cargo-config Source4: cargo-config.sh Source5: cargo-config.csh -Patch0000: rustc-1.78.0-disable-libssh2.patch +Patch0000: rustc-1.79.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 -# https://github.com/rust-lang/rust/pull/122270 -Patch0003: 0001-fix-long-linker-command-lines-failure-caused-by-rust.patch -# https://github.com/rust-lang/rust/pull/123763 -Patch0004: 0001-Set-the-host-library-path-in-run-make-v2.patch -Patch0005: 0002-Use-env-split_paths-join_paths-in-runtest.patch -# https://github.com/rust-lang/cargo/pull/13789 -Patch0006: 0001-Fix-2-tests-for-offline-execution.patch +Patch0003: 0001-add-support-for-ppc64le.patch %ifarch riscv64 Patch1000: embed-riscv64-target-abi-in-bc-when-plugin-_-lto-is-used.patch @@ -268,9 +262,6 @@ 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 -%patch -P 0006 -p1 -d src/tools/cargo %ifarch riscv64 %patch -P 1000 -p1 %endif @@ -330,6 +321,9 @@ fi # But there are two versions in openEuler. Why? # We don't have macros.clang so we need clang version here # This is for avoiding rpm syntax error +%ifarch ppc64le +%global _arch powerpc64le +%endif %global clang_maj_ver 17 %if %{?clang_maj_ver} >= 17 # This is the new one, used on openEuler 24.03 LTS or later @@ -525,6 +519,12 @@ export %{rust_env} %{_mandir}/man1/cargo*.1* %changelog +* Wed Jun 19 2024 wangkai <13474090681@163.com> - 1.79.0-1 +- Update to 1.79.0 + +* Thu Jun 13 2024 jianchunfu - 1.78.0-2 +- spec: Add support for ppc64le + * Tue May 07 2024 wangkai <13474090681@163.com> - 1.78.0-1 - Update to 1.78.0 diff --git a/rustc-1.78.0-src.tar.xz.asc b/rustc-1.78.0-src.tar.xz.asc deleted file mode 100644 index 444788c..0000000 --- a/rustc-1.78.0-src.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -wsFcBAABCgAQBQJmM4NKCRCFq5bm+hvl/gAAJYkP/jZRnYzi6STMXuqD5S4hbs2P -b7Upf2dp/moN800TfqluNhq6xuhFObNhQvNX0WEViv0QDZuok6gIRAaDOD3NIpFn -n3WepAJ8YMQOOnqa/0/dCQ5YvC2SkCUbu+Qxw4m9Hw7Q+Zju2Ghs2p51c3xRHaWX -+y37hdmAh1yNFR2UCv5K+HPrQEGkOJccP2HwrSE7OjD4XvHWHG9fetErKlOEh9Ws -6a60JupbgRlOcTOtNDeEaFBlw4jbUHgnj2hDeFkE9/rpYYQ77iQwei6BhNCxVmSo -rMEOTF0fpetPNmwKRShXDhTzKfztsCfxHERX9b35/P0c3V7Lq6q1nOWr/c9Fq9r7 -Tb5pM8ZT5hENNgwqBTgH5xgLQ0F/P2qthUfu8zE0AR+E4vDc/wg7fAhgibLwE3xj -6O2sucj+MXrpke178EhiEkQEY+27iDXO0mo+MMVKC6EEjDd3CSKunc8GtEcTHkjH -XndRR5mxLsP0OjIjsReoPKNp7i4UNnZ9CCAXDpaXdGSL0myonnGvDDKtmnZNU+2Z -N8nfnd19f61TCxDlyj2OUtq2BgKAardIBfjXKpG1q7YQr+zla0oaC8Ho8n3uYrRY -Min0GWU89b5BC9R4hVRshXJ9Q8rV88zNmdIgYcr32AOyOUXB0YBcZZ6MwZJUHiqq -KjL4+0cc3CF5w1GtEGIa -=5f1x ------END PGP SIGNATURE----- diff --git a/rustc-1.78.0-disable-libssh2.patch b/rustc-1.79.0-disable-libssh2.patch similarity index 40% rename from rustc-1.78.0-disable-libssh2.patch rename to rustc-1.79.0-disable-libssh2.patch index 3fec448..6b3c90c 100644 --- a/rustc-1.78.0-disable-libssh2.patch +++ b/rustc-1.79.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-04-04 15:01:24.003038403 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.lock 2024-04-04 15:01:24.005038377 -0700 -@@ -2111,7 +2111,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c +diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig rustc-1.79.0-src/src/tools/cargo/Cargo.lock +--- rustc-1.79.0-src/src/tools/cargo/Cargo.lock.orig 2024-06-13 16:37:16.640599290 -0700 ++++ rustc-1.79.0-src/src/tools/cargo/Cargo.lock 2024-06-13 16:37:16.646599231 -0700 +@@ -2150,7 +2150,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c 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", -@@ -2152,20 +2151,6 @@ dependencies = [ +@@ -2191,20 +2190,6 @@ dependencies = [ "pkg-config", "vcpkg", ] @@ -30,15 +30,15 @@ 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-04-04 15:01:24.005038377 -0700 -+++ rustc-beta-src/src/tools/cargo/Cargo.toml 2024-04-04 15:02:15.816367069 -0700 +diff -up rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig rustc-1.79.0-src/src/tools/cargo/Cargo.toml +--- rustc-1.79.0-src/src/tools/cargo/Cargo.toml.orig 2024-06-13 16:37:16.646599231 -0700 ++++ rustc-1.79.0-src/src/tools/cargo/Cargo.toml 2024-06-13 16:39:06.040526596 -0700 @@ -44,7 +44,7 @@ curl = "0.4.46" curl-sys = "0.4.72" filetime = "0.2.23" flate2 = { version = "1.0.28", default-features = false, features = ["zlib"] } --git2 = "0.18.2" -+git2 = { version = "0.18.2", default-features = false, features = ["https"] } +-git2 = "0.18.3" ++git2 = { version = "0.18.3", default-features = false, features = ["https"] } git2-curl = "0.19.0" - gix = { version = "0.58.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] } - gix-features-for-configuration-only = { version = "0.38.0", package = "gix-features", features = [ "parallel" ] } + gix = { version = "0.63.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk"] } + glob = "0.3.1" diff --git a/rustc-1.78.0-src.tar.xz b/rustc-1.79.0-src.tar.xz similarity index 100% rename from rustc-1.78.0-src.tar.xz rename to rustc-1.79.0-src.tar.xz diff --git a/rustc-1.79.0-src.tar.xz.asc b/rustc-1.79.0-src.tar.xz.asc new file mode 100644 index 0000000..6d416e2 --- /dev/null +++ b/rustc-1.79.0-src.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +wsFcBAABCgAQBQJmavafCRCFq5bm+hvl/gAAQAMP/joXqs2qXewULS5NmBe/7Fsc +3DkYKLopNOaT/3yaFoVa28ntBcDaknltNZGzmBK2CXmluBp9uFK/+ZkUbrenskmV +SuMbvJsjv93pzWCtouKJ2IbEeFYvEqHybuBgodpYcqq5gi+6rIKmbHC/TIADIoVw +VsElbOfOFF60qT1f8885oKw4smeH4l0e+9BACDSfe5zLNhNhQywjgGwibwVt3hMI +vWhUNxHe9llaXtI3IlhP+v2Au9tpRssw8A9O6bA38VfQ+C7nUcs21sk+Xx2HX+yx ++Xe9H5oGs06Vzpm6qmjDAzP7H1qMU40C28uFlCGlrngz7R4s2zl36EKc6N/foSwS +ti46epdSVww9BZrYHLPqflDvZY301y+aNaVNK0N9TarGUEV+1XCEzPyb7/GI1Tcy +x0R2ZErbLFDAu39XeTJflLu6ZY1teEKrHXB6Gjaczvn0vpGbPZeKSd26Z/CW6fj+ +ZFGPKUN9jEDsdZA/chSEsBjPuMSgzkHz4C796f8G1lz/QK0vC3va8BHWz7JudX5U +/7hi6/LegkuHfF/TeKm4AP4AItg7ZL+5bR7/81R8dOcmlcxS+7N9sOYc62zulu+B +T5vetP0VKQ+kGVXLO7GlzCRTcrJu8G3gtHY3yjOnGSEvOV+R8+PLR/MSiurVyoZ+ +G9gPU+Y8Q9VFOsIAnSxa +=92Lr +-----END PGP SIGNATURE----- -- Gitee