开源软件构建与测试

_service:tar_scm:rust.spec Changed

@@ -1,33 +1,33 @@
-%global bootstrap_rust 1.66.0
-%global bootstrap_cargo 1.66.0
-%global bootstrap_channel 1.66.0
-%global bootstrap_date 2022-12-15
+%global bootstrap_rust 1.69.0
+%global bootstrap_cargo 1.69.0
+%global bootstrap_channel 1.69.0
+%global bootstrap_date 2023-04-20
 %bcond_with llvm_static
 %bcond_with bundled_llvm
 %bcond_without bundled_libgit2
 %bcond_with disabled_libssh2
 %bcond_without curl_http2
 %bcond_without lldb
+%bcond_without analyzer
+
 Name:                rust
-Version:             1.67.1
-Release:             1
+Version:             1.70.0
+Release:             2
 Summary:             The Rust Programming Language
 License:             (ASL 2.0 or MIT) and (BSD and MIT)
 URL:                 https://www.rust-lang.org
-Source0:             https://static.rust-lang.org/dist/rustc-%{version}-src.tar.gz
+Source0:             https://static.rust-lang.org/dist/rustc-%{version}-src.tar.xz
 
-Patch0000:           rustc-1.65.0-disable-libssh2.patch
-Patch0001:           rustc-1.67.1-disable-http2.patch
+Patch0000:           rustc-1.70.0-disable-libssh2.patch
+Patch0001:           rustc-1.70.0-disable-http2.patch
 Patch0002:           clippy-driver-usage-should-user-friendly.patch
 Patch0003:           cargo-help-clippy-should-have-description-to-user.patch
 Patch0004:           fix-a-println-wrong-format.patch
-Patch0005:           compile-with-llvm-15.patch
 # By default, rust tries to use "rust-lld" as a linker for WebAssembly.
 Patch0006:           0001-Use-lld-provided-by-system-for-wasm.patch
 # Set a substitute-path in rust-gdb for standard library sources.
-Patch0007:           rustc-1.61.0-rust-gdb-substitute-path.patch
-# https://github.com/rust-lang/rust/pull/105082
-Patch0008:           0001-Fix-Async-Generator-ABI.patch
+Patch0007:           rustc-1.70.0-rust-gdb-substitute-path.patch
+Patch0008:           0001-add-musl-root-riscv64gc-detection-in-configure.py.patch
 
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -45,9 +45,15 @@
 end}
 %{lua: function rust_musl_triple(arch)
   local abi = "musl"
+  if arch == "riscv64" then
+    arch = "riscv64gc"
+  end
   return arch.."-unknown-linux-"..abi
 end}
 %{lua: function rust_musl_root(arch)
+  if arch == "riscv64" then
+    arch = "riscv64gc"
+  end
   return "--musl-root-"..arch
 end}
 %global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
@@ -85,18 +91,20 @@
 %global python python3
 BuildRequires:       %{python}
 %if %with bundled_llvm
-BuildRequires:       cmake3 >= 3.4.3
-Provides:            bundled(llvm) = 15.0.7
+BuildRequires:       cmake3 >= 3.13.4
+Provides:            bundled(llvm) = 16.0.2
 %else
 BuildRequires:       cmake >= 2.8.11
 %if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
 %else
-%global llvm llvm15
+# default llvm is decent enough on riscv64
+%global llvm llvm
 %global llvm_root %{_prefix}
 %endif
-BuildRequires:       %{llvm} >= 13.0
-BuildRequires:       %{llvm}-devel >= 13.0
+# rust currently requires llvm 14.0+
+BuildRequires:       %{llvm} >= 14.0.0
+BuildRequires:       %{llvm}-devel >= 14.0.0
 %if %with llvm_static
 BuildRequires:       %{llvm}-static libffi-devel
 %endif
@@ -121,6 +129,10 @@
 %endif
 %global musl_root %{_prefix}/musl
 
+# The 'analysis' component is removed since Rust 1.69.0
+# ref: https://github.com/rust-lang/rust/pull/101841
+Obsoletes:             %{name}-analysis < 1.69.0~
+
 %description
 Rust is a systems programming language that runs blazingly fast, prevents
 segfaults, and guarantees thread safety.
@@ -178,6 +190,7 @@
 %description -n rustfmt
 A tool for formatting Rust code according to style guidelines.
 
+%if %{with analyzer}
 %package analyzer
 Summary:Rust implementation of the Language Server Protocol
 Requires:            %{name}-src
@@ -190,6 +203,7 @@
 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.
+%endif
 
 %package -n clippy
 Summary:             Lints to catch common mistakes and improve your Rust code
@@ -207,14 +221,6 @@
 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
-Requires:            rust-std-static%{?_isa} = %{version}-%{release}
-%description analysis
-This package contains analysis data files produced with rustc's -Zsave-analysis
-feature for the Rust standard library. The RLS (Rust Language Server) uses this
-data to provide information about the Rust standard library.
-
 %package help
 Summary:     Help documents for rust
 
@@ -238,7 +244,7 @@
 %endif
 %if %without curl_http2
 %patch0001 -p1
-rm -rf vendor/libnghttp2-sys/
+rm -rf vendor/libnghttp2-sys*/
 %endif
 %if "%{python}" != "python3"
 sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure
@@ -246,22 +252,21 @@
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
-%patch0005 -p1
 %patch0006 -p1
 %patch0007 -p1
 %patch0008 -p1
-rm -rf vendor/curl-sys/curl/
+rm -rf vendor/curl-sys*/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
-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/
+rm -rf vendor/libffi-sys*/libffi/
+rm -rf vendor/libssh2-sys*/libssh2/
+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/
+rm -rf vendor/libgit2-sys*/libgit2/
 %endif
 %if %with disabled_libssh2
-rm -rf vendor/libssh2-sys/
+rm -rf vendor/libssh2-sys*/
 %endif
 sed -i.lzma -e '/LZMA_API_STATIC/d' src/bootstrap/tool.rs
 %if %{without bundled_llvm} && %{with llvm_static}
@@ -311,7 +316,7 @@
   --disable-rpath \
   %{enable_debuginfo} \
   --enable-extended \
-  --tools=analysis,cargo,clippy,rls,rust-analyzer,rustfmt,src \
+  --tools=cargo,clippy,%{?with_analyzer:rls,rust-analyzer,}rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
   %{?codegen_units_std} \
@@ -354,8 +359,10 @@
 mkdir -p %{buildroot}%{_docdir}/cargo
 ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html
 
+%if %{with analyzer}
 # 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
+%endif
 
 %if %without lldb
 rm -f %{buildroot}%{_bindir}/rust-lldb
@@ -368,7 +375,9 @@
 %{python} ./x.py test --no-fail-fast --stage 2 || :
 %{python} ./x.py test --no-fail-fast --stage 2 cargo || :
 %{python} ./x.py test --no-fail-fast --stage 2 clippy || :
+%if %{with analyzer}
 %{python} ./x.py test --no-fail-fast --stage 2 rust-analyzer || :
+%endif
 %{python} ./x.py test --no-fail-fast --stage 2 rustfmt || :
 %ldconfig_scriptlets
 
@@ -382,7 +391,9 @@
 %dir %{rustlibdir}
 %dir %{rustlibdir}/%{rust_triple}
 %dir %{rustlibdir}/%{rust_triple}/lib
+%if %{with analyzer}
 %{_libexecdir}/rust-analyzer-proc-macro-srv
+%endif
 %{rustlibdir}/%{rust_triple}/lib/*.so
 %dir %{rustlibdir}/%{rust_musl_triple}
 %dir %{rustlibdir}/%{rust_musl_triple}/lib
@@ -431,11 +442,13 @@
 %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
 
+%if %{with analyzer}
 %files analyzer
 %{_bindir}/rls
 %{_bindir}/rust-analyzer
 %doc src/tools/rust-analyzer/README.md
 %license src/tools/rust-analyzer/LICENSE-{APACHE,MIT}
+%endif
 
 %files -n clippy
 %{_bindir}/cargo-clippy
@@ -447,10 +460,6 @@
 %dir %{rustlibdir}
 %{rustlibdir}/src
 
-%files analysis
-%{rustlibdir}/%{rust_triple}/analysis/
-%{rustlibdir}/%{rust_musl_triple}/analysis/
-
 %files help
 %dir %{_docdir}/%{name}
 %docdir %{_docdir}/%{name}
@@ -463,6 +472,24 @@
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Tue Jul 18 2023 xu_ping <707078654@qq.com> - 1.70.0-2
+- Use llvm package instead of llvm15
+
+* Mon Jun 05 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.70.0-1
+- Update to 1.70.0
+- Fix rotten patch
+
+* Mon Apr 24 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.69.0-2
+- Add riscv64 specific changes
+
+* Mon Apr 24 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.69.0-1
+- Update to 1.69.0
+- Obsolete the removed rust-analysis subpackage
+- Switch to xz tarball to save space
+
+* Wed Mar 22 2023 wangkai <wangkai385@h-partners.com> - 1.68.0-1
+- Update to 1.68.0
+
 * Tue Feb 28 2023 wangkai <wangkai385@h-partners.com> - 1.67.1-1
 - Update to 1.67.1

_service:tar_scm:0001-Fix-Async-Generator-ABI.patch Deleted

@@ -1,55 +0,0 @@
-From ecf812777a260e35ec9cd0c7d9dbd17a3f5cf5f9 Mon Sep 17 00:00:00 2001
-From: Arpad Borsos <swatinem@swatinem.de>
-Date: Tue, 29 Nov 2022 23:17:08 +0100
-Subject: PATCH Fix Async Generator ABI
-
-This change was missed when making async generators implement `Future` directly.
-It did not cause any problems in codegen so far, as `GeneratorState<(), Output>`
-happens to have the same ABI as `Poll<Output>`.
----
- compiler/rustc_ty_utils/src/abi.rs | 22 +++++++++++++++++-----
- 1 file changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/compiler/rustc_ty_utils/src/abi.rs b/compiler/rustc_ty_utils/src/abi.rs
-index 73c7eb6992f0..d644cbccea11 100644
---- a/compiler/rustc_ty_utils/src/abi.rs
-+++ b/compiler/rustc_ty_utils/src/abi.rs
-@@ -85,7 +85,7 @@ fn fn_sig_for_fn_abi<'tcx>(
-                 bound_vars,
-             )
-         }
--        ty::Generator(_, substs, _) => {
-+        ty::Generator(did, substs, _) => {
-             let sig = substs.as_generator().poly_sig();
- 
-             let bound_vars = tcx.mk_bound_variable_kinds(
-@@ -104,10 +104,22 @@ fn fn_sig_for_fn_abi<'tcx>(
-             let env_ty = tcx.mk_adt(pin_adt_ref, pin_substs);
- 
-             let sig = sig.skip_binder();
--            let state_did = tcx.require_lang_item(LangItem::GeneratorState, None);
--            let state_adt_ref = tcx.adt_def(state_did);
--            let state_substs = tcx.intern_substs(&sig.yield_ty.into(), sig.return_ty.into());
--            let ret_ty = tcx.mk_adt(state_adt_ref, state_substs);
-+            // The `FnSig` and the `ret_ty` here is for a generators main
-+            // `Generator::resume(...) -> GeneratorState` function in case we
-+            // have an ordinary generator, or the `Future::poll(...) -> Poll`
-+            // function in case this is a special generator backing an async construct.
-+            let ret_ty = if tcx.generator_is_async(did) {
-+                let state_did = tcx.require_lang_item(LangItem::Poll, None);
-+                let state_adt_ref = tcx.adt_def(state_did);
-+                let state_substs = tcx.intern_substs(&sig.return_ty.into());
-+                tcx.mk_adt(state_adt_ref, state_substs)
-+            } else {
-+                let state_did = tcx.require_lang_item(LangItem::GeneratorState, None);
-+                let state_adt_ref = tcx.adt_def(state_did);
-+                let state_substs = tcx.intern_substs(&sig.yield_ty.into(), sig.return_ty.into());
-+                tcx.mk_adt(state_adt_ref, state_substs)
-+            };
-+
-             ty::Binder::bind_with_vars(
-                 tcx.mk_fn_sig(
-                     env_ty, sig.resume_ty.iter(),
--- 
-2.39.1
-

_service:tar_scm:0001-add-musl-root-riscv64gc-detection-in-configure.py.patch Added

@@ -0,0 +1,25 @@
+From a216df759724049385b729f038de2cb49c580cd2 Mon Sep 17 00:00:00 2001
+From: jchzhou <zhoujiacheng@iscas.ac.cn>
+Date: Wed, 8 Mar 2023 00:10:42 +0800
+Subject: PATCH add musl-root-riscv64gc detection in configure.py
+
+---
+ src/bootstrap/configure.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
+index 6b139decb..55855f8a1 100755
+--- a/src/bootstrap/configure.py
++++ b/src/bootstrap/configure.py
+@@ -140,6 +140,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-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
++  "riscv64gc-unknown-linux-musl install directory")
+ v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
+   "rootfs in qemu testing, you probably don't want to use this")
+ v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
+-- 
+2.39.2
+

_service:tar_scm:compile-with-llvm-15.patch Deleted

_service:tar_scm:rustc-1.61.0-rust-gdb-substitute-path.patch Deleted

_service:tar_scm:rustc-1.67.1-disable-http2.patch -> _service:tar_scm:rustc-1.70.0-disable-http2.patch Changed

@@ -1,6 +1,6 @@
---- rustc-beta-src/Cargo.lock.orig	2023-01-24 13:25:47.822917185 -0800
-+++ rustc-beta-src/Cargo.lock	2023-01-24 13:25:47.824917142 -0800
-@@ -1062,7 +1062,6 @@
+--- rustc-beta-src/Cargo.lock.orig	2023-05-24 16:49:05.242510531 -0700
++++ rustc-beta-src/Cargo.lock	2023-05-24 16:51:11.741865603 -0700
+@@ -1197,7 +1197,6 @@ checksum = "14d05c10f541ae6f3bc5b3d923c2
  dependencies = 
   "cc",
   "libc",
@@ -8,7 +8,7 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2181,16 +2180,6 @@
+@@ -2989,16 +2988,6 @@ source = "registry+https://github.com/ru
  checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a"
  
  package
@@ -22,23 +22,23 @@
 -
 -
 -package
- name = "libssh2-sys"
- version = "0.2.23"
+ name = "libz-sys"
+ version = "1.1.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-01-24 13:25:47.824917142 -0800
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-01-24 13:26:29.209044200 -0800
-@@ -21,7 +21,7 @@
- cargo-platform = { path = "crates/cargo-platform", version = "0.1.2" }
- cargo-util = { path = "crates/cargo-util", version = "0.2.3" }
- crates-io = { path = "crates/crates-io", version = "0.35.0" }
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-05-24 16:49:05.244510489 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-05-24 16:51:04.683013189 -0700
+@@ -23,7 +23,7 @@ cargo-platform = { path = "crates/cargo-
+ cargo-util = { path = "crates/cargo-util", version = "0.2.4" }
+ clap = "4.2.0"
+ crates-io = { path = "crates/crates-io", version = "0.36.0" }
 -curl = { version = "0.4.44", features = "http2" }
 +curl = { version = "0.4.44", features =  }
- curl-sys = "0.4.59"
+ curl-sys = "0.4.61"
  env_logger = "0.10.0"
- pretty_env_logger = { version = "0.4", optional = true }
---- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-01-21 17:17:19.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-01-24 13:25:47.824917142 -0800
-@@ -403,16 +403,9 @@
+ filetime = "0.2.9"
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-05-19 19:05:42.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-05-24 16:49:05.244510489 -0700
+@@ -407,16 +407,9 @@ impl<'cfg> PackageSet<'cfg> {
          sources: SourceMap<'cfg>,
          config: &'cfg Config,
      ) -> CargoResult<PackageSet<'cfg>> {
@@ -58,18 +58,9 @@
  
          Ok(PackageSet {
              packages: package_ids
-@@ -658,7 +651,7 @@
- macro_rules! try_old_curl {
-     ($e:expr, $msg:expr) => {
-         let result = $e;
--        if cfg!(target_os = "macos") {
-+        if cfg!(any(target_os = "linux", target_os = "macos")) {
-             if let Err(e) = result {
-                 warn!("ignoring libcurl {} error: {}", $msg, e);
-             }
---- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-01-21 17:17:19.000000000 -0800
-+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-01-24 13:25:47.824917142 -0800
-@@ -223,16 +223,8 @@
+--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-05-24 16:49:05.245510468 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-05-24 16:51:57.916900146 -0700
+@@ -229,16 +229,8 @@ impl<'cfg> HttpRegistry<'cfg> {
          }
          self.fetch_started = true;
  
@@ -86,5 +77,16 @@
 +        // Multiplexing is disabled because the system libcurl doesn't support it.
 +        self.multiplexing = false;
  
-         self.config
-             .shell()
+         if !self.quiet {
+             self.config
+--- rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs.orig	2023-05-19 19:05:42.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs	2023-05-24 16:49:05.245510468 -0700
+@@ -25,7 +25,7 @@ impl<T> PollExt<T> for Poll<T> {
+ macro_rules! try_old_curl {
+     ($e:expr, $msg:expr) => {
+         let result = $e;
+-        if cfg!(target_os = "macos") {
++        if cfg!(any(target_os = "linux", target_os = "macos")) {
+             if let Err(e) = result {
+                 warn!("ignoring libcurl {} error: {}", $msg, e);
+             }

_service:tar_scm:rustc-1.65.0-disable-libssh2.patch -> _service:tar_scm:rustc-1.70.0-disable-libssh2.patch Changed

@@ -1,6 +1,6 @@
---- rustc-beta-src/Cargo.lock.orig	2022-09-24 10:20:14.000000000 -0700
-+++ rustc-beta-src/Cargo.lock	2022-10-04 10:26:35.490270607 -0700
-@@ -1971,7 +1971,6 @@
+--- rustc-beta-src/Cargo.lock.orig	2023-05-19 19:02:31.000000000 -0700
++++ rustc-beta-src/Cargo.lock	2023-05-24 16:36:33.312232441 -0700
+@@ -2967,7 +2967,6 @@
  dependencies = 
   "cc",
   "libc",
@@ -8,14 +8,14 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2004,20 +2003,6 @@
+@@ -3000,20 +2999,6 @@
  
  
  package
 -name = "libssh2-sys"
--version = "0.2.23"
+-version = "0.3.0"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
+-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
 -dependencies = 
 - "cc",
 - "libc",
@@ -29,9 +29,9 @@
  name = "libz-sys"
  version = "1.1.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/vendor/git2/Cargo.toml.orig	2022-10-04 10:26:35.490270607 -0700
-+++ rustc-beta-src/vendor/git2/Cargo.toml	2022-10-04 10:28:14.002187686 -0700
-@@ -58,9 +58,7 @@
+--- rustc-beta-src/vendor/git2/Cargo.toml.orig	2023-05-19 21:16:57.000000000 -0700
++++ rustc-beta-src/vendor/git2/Cargo.toml	2023-05-24 16:33:42.043813439 -0700
+@@ -55,9 +55,7 @@
  
  features
  default =

_service:tar_scm:rustc-1.70.0-rust-gdb-substitute-path.patch Added

@@ -0,0 +1,21 @@
+diff --git a/src/etc/rust-gdb b/src/etc/rust-gdb
+index 9abed30ea6f7..e4bf55df3688 100755
+--- a/src/etc/rust-gdb
++++ b/src/etc/rust-gdb
+@@ -13,8 +13,6 @@ fi
+ # Find out where the pretty printer Python module is
+ RUSTC_SYSROOT="$("$RUSTC" --print=sysroot)"
+ GDB_PYTHON_MODULE_DIRECTORY="$RUSTC_SYSROOT/lib/rustlib/etc"
+-# Get the commit hash for path remapping
+-RUSTC_COMMIT_HASH="$("$RUSTC" -vV | sed -n 's/commit-hash: $a-zA-Z0-9_*$/\1/p')"
+ 
+ # Run GDB with the additional arguments that load the pretty printers
+ # Set the environment variable `RUST_GDB` to overwrite the call to a
+@@ -23,6 +21,6 @@ RUST_GDB="${RUST_GDB:-gdb}"
+ PYTHONPATH="$PYTHONPATH:$GDB_PYTHON_MODULE_DIRECTORY" exec ${RUST_GDB} \
+   --directory="$GDB_PYTHON_MODULE_DIRECTORY" \
+   -iex "add-auto-load-safe-path $GDB_PYTHON_MODULE_DIRECTORY" \
+-  -iex "set substitute-path /rustc/$RUSTC_COMMIT_HASH $RUSTC_SYSROOT/lib/rustlib/src/rust" \
++  -iex "set substitute-path @BUILDDIR@ $RUSTC_SYSROOT/lib/rustlib/src/rust" \
+   "$@"
+

_service Changed

_service:tar_scm:rustc-1.67.1-src.tar.gz Deleted

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

Changes of Revision 3