开源软件构建与测试

_service:tar_scm:rust.spec Changed

@@ -1,17 +1,23 @@
-%global bootstrap_rust 1.79.0
-%global bootstrap_cargo 1.79.0
-%global bootstrap_channel 1.79.0
+%global bootstrap_rust 1.82.0
+%global bootstrap_cargo 1.82.0
+%global bootstrap_channel 1.82.0
 %global bootstrap_date 2024-06-13
 %global bootstrap_arches x86_64 aarch64 riscv64
 %bcond_with llvm_static
-%bcond_with bundled_llvm
+%bcond_without bundled_llvm
 %bcond_without bundled_libgit2
 %bcond_with disabled_libssh2
 %bcond_without lldb
 %bcond_without analyzer
+# disable rust-lld (enabled by default on x86 since 1.80.0 via pull/124129) for
+# building with system llvm (17.0.6)
+# https://github.com/rust-lang/rust/issues/131291
+%ifarch %{ix86} x86_64
+%bcond_with rust_lld
+%endif
 
 Name:                rust
-Version:             1.80.0
+Version:             1.82.0
 Release:             2
 Summary:             The Rust Programming Language
 License:             Apache-2.0 OR MIT
@@ -24,12 +30,14 @@
 Source4:             cargo-config.sh
 Source5:             cargo-config.csh
 
-Patch0000:           rustc-1.80.0-disable-libssh2.patch
+Patch0000:           rustc-1.82.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
+# https://github.com/rust-lang/rust/pull/130034 (from 1.83)
+Patch0004:           0001-Fix-enabling-wasm-component-ld-to-match-other-tools.patch
 
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -100,7 +108,7 @@
 BuildRequires:       %{python}
 %if %with bundled_llvm
 BuildRequires:       cmake3 >= 3.13.4
-Provides:            bundled(llvm) = 17.0.4
+Provides:            bundled(llvm) = 19.1.1
 %else
 BuildRequires:       cmake >= 2.8.11
 %if %defined llvm
@@ -110,9 +118,9 @@
 %global llvm llvm
 %global llvm_root %{_prefix}
 %endif
-# rust currently requires llvm 14.0+
-BuildRequires:       %{llvm} >= 15.0.0
-BuildRequires:       %{llvm}-devel >= 15.0.0
+# Minimum external LLVM for rust 1.82
+BuildRequires:       %{llvm} >= 17.0.0
+BuildRequires:       %{llvm}-devel >= 17.0.0
 %if %with llvm_static
 BuildRequires:       %{llvm}-static libffi-devel
 %endif
@@ -210,6 +218,7 @@
 # binary that implements LSP just enough to recommend rust-analyzer.
 Obsoletes:           rls < 1.65.0~
 Obsoletes:           rls-preview < 1.31.6
+Requires:           %{name} = %{version}-%{release}
 
 %description analyzer
 rust-analyzer is an implementation of Language Server Protocol for the Rust
@@ -266,6 +275,7 @@
 %patch -P 0001 -p1
 %patch -P 0002 -p1
 %patch -P 0003 -p1
+%patch -P 0004 -p1
 rm -rf vendor/curl-sys*/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
 rm -rf vendor/libffi-sys*/libffi/
@@ -314,7 +324,11 @@
 %define codegen_units_std --set rust.codegen-units-std=1
 %endif
 ncpus=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+%if %{with bundled_llvm}
+max_cpus=$(( ($(free -g | awk '/^Mem:/{print $2}') + 1) / 4 ))
+%else
 max_cpus=$(( ($(free -g | awk '/^Mem:/{print $2}') + 1) / 2 ))
+%endif
 if  "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ; then
   ncpus="$max_cpus"
 fi
@@ -346,6 +360,7 @@
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple},%{rust_musl_triple} \
 %endif
   --set target.%{rust_triple}.profiler="%{profiler}" \
+  %{!?with_rust_lld: --set rust.lld=false} \
   --python=%{python} \
   --local-rust-root=%{local_rust_root} \
   %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
@@ -528,6 +543,12 @@
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Wed Nov 13 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.82.0-2
+- Switch to bundled llvm for building, halve the 'max_cpus' in this case
+
+* Wed Oct 23 2024 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.82.0-1
+- Update to 1.82.0
+
 * Tue Oct 22 2024 zhangwenlong <zhangwenlong@loongson.cn> - 1.80.0-2
 - disable musl for loongarch64

_service:tar_scm:0001-Fix-enabling-wasm-component-ld-to-match-other-tools.patch Added

@@ -0,0 +1,147 @@
+From c15469a7fec811d1a4f69ff26e18c6f383df41d2 Mon Sep 17 00:00:00 2001
+From: Alex Crichton <alex@alexcrichton.com>
+Date: Fri, 6 Sep 2024 09:21:33 -0700
+Subject: PATCH Fix enabling wasm-component-ld to match other tools
+
+It was pointed out recentlycomment that enabling `wasm-component-ld`
+as a host tool is different from other host tools. This commit refactors
+the logic to match by deduplicating selection of when to build other
+tools and then using the same logic for `wasm-component-ld`.
+
+comment: https://github.com/rust-lang/rust/pull/127866#issuecomment-2333434720
+---
+ src/bootstrap/src/core/build_steps/compile.rs |  2 +-
+ src/bootstrap/src/core/build_steps/dist.rs    |  2 +-
+ src/bootstrap/src/core/build_steps/tool.rs    | 38 +++----------------
+ src/bootstrap/src/lib.rs                      | 17 +++++----
+ 4 files changed, 17 insertions(+), 42 deletions(-)
+
+diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
+index 1936c91ef83c..102c9fd25543 100644
+--- a/src/bootstrap/src/core/build_steps/compile.rs
++++ b/src/bootstrap/src/core/build_steps/compile.rs
+@@ -1912,7 +1912,7 @@ fn run(self, builder: &Builder<'_>) -> Compiler {
+         // delegates to the `rust-lld` binary for linking and then runs
+         // logic to create the final binary. This is used by the
+         // `wasm32-wasip2` target of Rust.
+-        if builder.build_wasm_component_ld() {
++        if builder.tool_enabled("wasm-component-ld") {
+             let wasm_component_ld_exe =
+                 builder.ensure(crate::core::build_steps::tool::WasmComponentLd {
+                     compiler: build_compiler,
+diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
+index 4957de2e1b79..ccb5656d6716 100644
+--- a/src/bootstrap/src/core/build_steps/dist.rs
++++ b/src/bootstrap/src/core/build_steps/dist.rs
+@@ -473,7 +473,7 @@ fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
+                     );
+                 }
+             }
+-            if builder.build_wasm_component_ld() {
++            if builder.tool_enabled("wasm-component-ld") {
+                 let src_dir = builder.sysroot_libdir(compiler, host).parent().unwrap().join("bin");
+                 let ld = exe("wasm-component-ld", compiler.host);
+                 builder.copy_link(&src_dir.join(&ld), &dst_dir.join(&ld));
+diff --git a/src/bootstrap/src/core/build_steps/tool.rs b/src/bootstrap/src/core/build_steps/tool.rs
+index 3a1eb43b801f..3c2d791c2090 100644
+--- a/src/bootstrap/src/core/build_steps/tool.rs
++++ b/src/bootstrap/src/core/build_steps/tool.rs
+@@ -693,14 +693,7 @@ impl Step for Cargo {
+ 
+     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+         let builder = run.builder;
+-        run.path("src/tools/cargo").default_condition(
+-            builder.config.extended
+-                && builder.config.tools.as_ref().map_or(
+-                    true,
+-                    // If `tools` is set, search list for this tool.
+-                    |tools| tools.iter().any(|tool| tool == "cargo"),
+-                ),
+-        )
++        run.path("src/tools/cargo").default_condition(builder.tool_enabled("cargo"))
+     }
+ 
+     fn make_run(run: RunConfig<'_>) {
+@@ -772,14 +765,7 @@ impl Step for RustAnalyzer {
+ 
+     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+         let builder = run.builder;
+-        run.path("src/tools/rust-analyzer").default_condition(
+-            builder.config.extended
+-                && builder
+-                    .config
+-                    .tools
+-                    .as_ref()
+-                    .map_or(true, |tools| tools.iter().any(|tool| tool == "rust-analyzer")),
+-        )
++        run.path("src/tools/rust-analyzer").default_condition(builder.tool_enabled("rust-analyzer"))
+     }
+ 
+     fn make_run(run: RunConfig<'_>) {
+@@ -821,12 +807,8 @@ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+         run.path("src/tools/rust-analyzer")
+             .path("src/tools/rust-analyzer/crates/proc-macro-srv-cli")
+             .default_condition(
+-                builder.config.extended
+-                    && builder.config.tools.as_ref().map_or(true, |tools| {
+-                        tools.iter().any(|tool| {
+-                            tool == "rust-analyzer" || tool == "rust-analyzer-proc-macro-srv"
+-                        })
+-                    }),
++                builder.tool_enabled("rust-analyzer")
++                    || builder.tool_enabled("rust-analyzer-proc-macro-srv"),
+             )
+     }
+ 
+@@ -874,16 +856,8 @@ impl Step for LlvmBitcodeLinker {
+ 
+     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+         let builder = run.builder;
+-        run.path("src/tools/llvm-bitcode-linker").default_condition(
+-            builder.config.extended
+-                && builder
+-                    .config
+-                    .tools
+-                    .as_ref()
+-                    .map_or(builder.build.unstable_features(), |tools| {
+-                        tools.iter().any(|tool| tool == "llvm-bitcode-linker")
+-                    }),
+-        )
++        run.path("src/tools/llvm-bitcode-linker")
++            .default_condition(builder.tool_enabled("llvm-bitcode-linker"))
+     }
+ 
+     fn make_run(run: RunConfig<'_>) {
+diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
+index c76ce3409562..780024e307ed 100644
+--- a/src/bootstrap/src/lib.rs
++++ b/src/bootstrap/src/lib.rs
+@@ -1407,16 +1407,17 @@ fn default_wasi_runner(&self) -> Option<String> {
+         None
+     }
+ 
+-    /// Returns whether it's requested that `wasm-component-ld` is built as part
+-    /// of the sysroot. This is done either with the `extended` key in
+-    /// `config.toml` or with the `tools` set.
+-    fn build_wasm_component_ld(&self) -> bool {
+-        if self.config.extended {
+-            return true;
++    /// Returns whether the specified tool is configured as part of this build.
++    ///
++    /// This requires that both the `extended` key is set and the `tools` key is
++    /// either unset or specifically contains the specified tool.
++    fn tool_enabled(&self, tool: &str) -> bool {
++        if !self.config.extended {
++            return false;
+         }
+         match &self.config.tools {
+-            Some(set) => set.contains("wasm-component-ld"),
+-            None => false,
++            Some(set) => set.contains(tool),
++            None => true,
+         }
+     }
+ 
+-- 
+2.46.0
+

_service:tar_scm:0001-Use-lld-provided-by-system.patch Changed

@@ -1,19 +1,21 @@
-From 61b5cc96337da2121221dd1bcdb63fd36551d065 Mon Sep 17 00:00:00 2001
+From 3d8c6d095581e8d7585f3772cfd16f6367f3c008 Mon Sep 17 00:00:00 2001
 From: Josh Stone <jistone@redhat.com>
-Date: Wed, 1 Nov 2023 15:21:15 -0700
+Date: Fri, 16 Aug 2024 10:12:58 -0700
 Subject: PATCH Use lld provided by system
 
 ---
- compiler/rustc_target/src/spec/base/wasm.rs                   | 3 +--
- compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs | 2 +-
- compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs | 1 +
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ compiler/rustc_target/src/spec/base/wasm.rs                    | 3 +--
+ .../src/spec/targets/aarch64_unknown_none_softfloat.rs         | 2 +-
+ compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs | 1 +
+ compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs  | 2 +-
+ compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs  | 1 +
+ 5 files changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/compiler/rustc_target/src/spec/base/wasm.rs b/compiler/rustc_target/src/spec/base/wasm.rs
-index 87ade9e58cf4..2ddff95febab 100644
+index f237391016e7..08bcd9699b4a 100644
 --- a/compiler/rustc_target/src/spec/base/wasm.rs
 +++ b/compiler/rustc_target/src/spec/base/wasm.rs
-@@ -91,8 +91,7 @@ macro_rules! args {
+@@ -85,8 +85,7 @@ macro_rules! args {
          // arguments just yet
          limit_rdylib_exports: false,
  
@@ -23,8 +25,33 @@
          linker_flavor: LinkerFlavor::WasmLld(Cc::No),
  
          pre_link_args,
+diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
+index 222d5651b521..4b780bc8a8e7 100644
+--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
++++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_none_softfloat.rs
+@@ -14,7 +14,7 @@ pub fn target() -> Target {
+     let opts = TargetOptions {
+         abi: "softfloat".into(),
+         linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
+-        linker: Some("rust-lld".into()),
++        linker: Some("lld".into()),
+         features: "+v8a,+strict-align,-neon,-fp-armv8".into(),
+         relocation_model: RelocModel::Static,
+         disable_redzone: true,
+diff --git a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
+index 429303170b6b..19d4ec53f6d8 100644
+--- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
++++ b/compiler/rustc_target/src/spec/targets/aarch64_unknown_uefi.rs
+@@ -9,6 +9,7 @@ pub fn target() -> Target {
+     base.max_atomic_width = Some(128);
+     base.add_pre_link_args(LinkerFlavor::Msvc(Lld::No), &"/machine:arm64");
+     base.features = "+v8a".into();
++    base.linker = Some("lld".into());
+ 
+     Target {
+         llvm_target: "aarch64-unknown-windows".into(),
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
-index 9aa95a35f8e5..a9172f9441b7 100644
+index 549706998d46..b7e9158ddef5 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_none.rs
 @@ -17,7 +17,7 @@ pub fn target() -> Target {
@@ -33,11 +60,11 @@
          linker_flavor: LinkerFlavor::Gnu(Cc::No, Lld::Yes),
 -        linker: Some("rust-lld".into()),
 +        linker: Some("lld".into()),
-         features:
-             "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-3dnow,-3dnowa,-avx,-avx2,+soft-float"
-                 .into(),
+         features: "-mmx,-sse,-sse2,-sse3,-ssse3,-sse4.1,-sse4.2,-avx,-avx2,+soft-float".into(),
+         supported_sanitizers: SanitizerSet::KCFI | SanitizerSet::KERNELADDRESS,
+         disable_redzone: true,
 diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
-index 5abfb8162f70..13cb43bda1a4 100644
+index 6da1fcca58c8..c84ae44576d4 100644
 --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
 +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_uefi.rs
 @@ -16,6 +16,7 @@ pub fn target() -> Target {
@@ -49,5 +76,5 @@
      // We disable MMX and SSE for now, even though UEFI allows using them. Problem is, you have to
      // enable these CPU features explicitly before their first use, otherwise their instructions
 -- 
-2.41.0
+2.46.0

_service:tar_scm:0001-add-support-for-ppc64le.patch Changed

@@ -10,7 +10,7 @@
  .../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 +++
+ vendor/target-lexicon-0.12.15/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
@@ -143,20 +143,20 @@
              "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 {
+diff --git a/vendor/target-lexicon-0.12.15/src/targets.rs b/vendor/target-lexicon-0.12.15/src/targets.rs
+index d14a7607b..f64e49568 100644
+--- a/vendor/target-lexicon-0.12.15/src/targets.rs
++++ b/vendor/target-lexicon-0.12.15/src/targets.rs
+@@ -1692,6 +1692,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",
+             "powerpc64-unknown-linux-musl",
 -- 
 2.44.0

_service:tar_scm:rustc-1.80.0-disable-libssh2.patch -> _service:tar_scm:rustc-1.82.0-disable-libssh2.patch Changed

@@ -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-07-05 18:14:51.101370053 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-07-05 18:14:51.104370020 -0700
-@@ -2151,7 +2151,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c
+--- 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
  dependencies = 
   "cc",
   "libc",
@@ -9,7 +9,7 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2192,20 +2191,6 @@ dependencies = 
+@@ -2197,20 +2196,6 @@ dependencies = 
   "pkg-config",
   "vcpkg",
  
@@ -31,14 +31,14 @@
  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-07-05 18:14:51.104370020 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-07-05 18:15:36.584867840 -0700
+--- 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"
- curl-sys = "0.4.72"
+ curl-sys = "0.4.73"
  filetime = "0.2.23"
  flate2 = { version = "1.0.30", default-features = false, features = "zlib" }
--git2 = "0.18.3"
-+git2 = { version = "0.18.3", default-features = false, features = "https" }
- git2-curl = "0.19.0"
- gix = { version = "0.63.0", default-features = false, features = "blocking-http-transport-curl", "progress-tree", "revision", "parallel", "dirwalk" }
+-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" }
  glob = "0.3.1"

_service:tar_scm:rustc-1.80.0-src.tar.xz Deleted

_service:tar_scm:rustc-1.80.0-src.tar.xz.asc Deleted

_service:tar_scm:rustc-1.82.0-src.tar.xz Added

_service:tar_scm:rustc-1.82.0-src.tar.xz.asc Added

Changes of Revision 7