开源软件构建与测试

Changes of Revision 3

_service:extract_file:rust.spec Changed

@@ -1,50 +1,35 @@
-%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_version 1.68.0
+%global bootstrap_version 1.68.0
+%global bootstrap_version 1.68.0
+%global bootstrap_date 2023-03-09
 %bcond_with llvm_static
 %bcond_with bundled_llvm
 %bcond_without bundled_libgit2
 %bcond_with disabled_libssh2
 %bcond_without curl_http2
 %bcond_without lldb
-
-# Only x86_64 and aarch64 musl targets are tier2 "guaranteed to build" by upstream
-# Hence enable them for x84_64, aarch64 only
-%ifarch x86_64 aarch64
-%bcond_without musl
-%endif
-
 %ifnarch riscv64
 %bcond_without analyzer
 %endif
 
 Name:                rust
-Version:             1.67.1
-Release:             3
+Version:             1.69.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
+Patch0001:           rustc-1.69.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
-
-# riscv64 specific changes:
-# standalone llvm-15 package doesn't exist on riscv64 as default llvm is decent enough
-%ifnarch riscv64
 Patch0005:           compile-with-llvm-15.patch
-%endif
-
 # 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
 
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -60,9 +45,6 @@
   end
   return arch.."-unknown-linux-"..abi
 end}
-%global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
-
-%if %{with musl}
 %{lua: function rust_musl_triple(arch)
   local abi = "musl"
   return arch.."-unknown-linux-"..abi
@@ -70,10 +52,9 @@
 %{lua: function rust_musl_root(arch)
   return "--musl-root-"..arch
 end}
+%global rust_triple %{lua: print(rust_triple(rpm.expand("%{_target_cpu}")))}
 %global rust_musl_triple %{lua: print(rust_musl_triple(rpm.expand("%{_target_cpu}")))}
 %global rust_musl_root %{lua: print(rust_musl_root(rpm.expand("%{_target_cpu}")))}
-%endif
-
 %if %defined bootstrap_arches
 %{lua: do
   local bootstrap_arches = {}
@@ -101,13 +82,8 @@
 BuildRequires:       (%{name} >= %{bootstrap_rust} with %{name} <= %{version})
 %global local_rust_root %{_prefix}
 %endif
-BuildRequires:       make gcc gcc-c++ ncurses-devel curl curl-devel pkgconfig(libcurl) pkgconfig(liblzma)
+BuildRequires:       make gcc gcc-c++ ncurses-devel curl curl-devel musl-libc-static musl-gcc pkgconfig(libcurl) pkgconfig(liblzma)
 BuildRequires:       pkgconfig(openssl) pkgconfig(zlib) pkgconfig(libssh2) >= 1.6.0
-
-%if %{with musl}
-BuildRequires:       musl-libc-static musl-gcc
-%endif
-
 %global python python3
 BuildRequires:       %{python}
 %if %with bundled_llvm
@@ -118,19 +94,17 @@
 %if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
 %else
-
-# riscv64 specific changes:
-# standalone llvm-15 packages doesn't exist on riscv64 as default llvm is decent enough
+# default llvm is decent enough on riscv64
 %ifnarch riscv64
 %global llvm llvm15
 %else
 %global llvm llvm
 %endif
-
 %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
@@ -153,10 +127,11 @@
 %global llvm_has_filecheck 1
 %endif
 %endif
-
-%if %{with musl}
 %global musl_root %{_prefix}/musl
-%endif
+
+# 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
@@ -246,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
 
@@ -285,12 +252,12 @@
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
+# default llvm is decent enough on riscv64
 %ifnarch riscv64
 %patch0005 -p1
 %endif
 %patch0006 -p1
 %patch0007 -p1
-%patch0008 -p1
 rm -rf vendor/curl-sys/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
 rm -rf vendor/libssh2-sys/libssh2/
@@ -342,9 +309,8 @@
 fi
 %configure --disable-option-checking \
   --libdir=%{common_libdir} \
-  %{?with_musl: %{rust_musl_root}=%{musl_root}} \
-  --build=%{rust_triple} --host=%{rust_triple} \
-  --target=%{rust_triple}%{?with_musl:,%{rust_musl_triple}} \
+  %{rust_musl_root}=%{musl_root} \
+  --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple},%{rust_musl_triple} \
   --python=%{python} \
   --local-rust-root=%{local_rust_root} \
   %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
@@ -353,7 +319,7 @@
   --disable-rpath \
   %{enable_debuginfo} \
   --enable-extended \
-  --tools=analysis,cargo,clippy,%{?with_analyzer: ,rls,rust-analyzer}rustfmt,src \
+  --tools=cargo,clippy,%{?with_analyzer:rls,rust-analyzer,}rustfmt,src \
   --enable-vendor \
   --enable-verbose-tests \
   %{?codegen_units_std} \
@@ -430,24 +396,20 @@
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{_libexecdir}/rust-analyzer-proc-macro-srv
 %{rustlibdir}/%{rust_triple}/lib/*.so
-%if %{with musl}
 %dir %{rustlibdir}/%{rust_musl_triple}
 %dir %{rustlibdir}/%{rust_musl_triple}/lib
-%endif
 
 %files std-static
 %dir %{rustlibdir}
 %dir %{rustlibdir}/%{rust_triple}
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.rlib
-%if %{with musl}
 %dir %{rustlibdir}/%{rust_musl_triple}
 %dir %{rustlibdir}/%{rust_musl_triple}/lib
 %{rustlibdir}/%{rust_musl_triple}/lib/*.rlib
 %{rustlibdir}/%{rust_musl_triple}/lib/self-contained/*.o
 %{rustlibdir}/%{rust_musl_triple}/lib/self-contained/libunwind.a
 %{rustlibdir}/%{rust_musl_triple}/lib/self-contained/libc.a
-%endif
 
 %files debugger-common
 %dir %{rustlibdir}
@@ -499,12 +461,6 @@
 %dir %{rustlibdir}
 %{rustlibdir}/src
 
-%files analysis
-%{rustlibdir}/%{rust_triple}/analysis/
-%if %{with musl}
-%{rustlibdir}/%{rust_musl_triple}/analysis/
-%endif
-
 %files help
 %dir %{_docdir}/%{name}
 %docdir %{_docdir}/%{name}
@@ -517,12 +473,16 @@
 %{_mandir}/man1/cargo*.1*
 
 %changelog
-* Mon Mar 21 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.67.1-3
-- Temporarily disable rust-analyzer and rls stub for riscv64
-
-* Mon Mar 06 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.67.1-2
+* Mon Apr 24 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.69.0-2
 - Add riscv64 specific changes
-- Only enable musl targets for x86_64 and aarch64
+
+* 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:extract_file: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:extract_file:rustc-1.67.1-disable-http2.patch -> _service:extract_file:rustc-1.69.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-03-23 17:10:30.810989345 -0700
++++ rustc-beta-src/Cargo.lock	2023-03-23 17:10:30.812989303 -0700
+@@ -1142,7 +1142,6 @@
  dependencies = 
   "cc",
   "libc",
@@ -8,7 +8,7 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2181,16 +2180,6 @@
+@@ -2375,16 +2374,6 @@
  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" }
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-03-23 17:10:30.812989303 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-03-23 17:11:26.242836664 -0700
+@@ -23,7 +23,7 @@
  cargo-util = { path = "crates/cargo-util", version = "0.2.3" }
- crates-io = { path = "crates/crates-io", version = "0.35.0" }
+ clap = "4.1.3"
+ 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"
  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-03-19 00:20:55.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-03-23 17:10:30.812989303 -0700
+@@ -401,16 +401,9 @@
          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-03-19 00:20:55.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-03-23 17:10:30.813989282 -0700
+@@ -220,16 +220,8 @@
          }
          self.fetch_started = true;
  
@@ -88,3 +79,14 @@
  
          self.config
              .shell()
+--- rustc-beta-src/src/tools/cargo/src/cargo/util/network.rs.orig	2023-03-19 00:20:55.000000000 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/util/network.rs	2023-03-23 17:10:30.813989282 -0700
+@@ -116,7 +116,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);
+             }

_service Changed

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

_service:extract_file:rustc-1.69.0-src.tar.xz Added

_service:tar_scm:rust-1679728828.6be4f8d.tar Deleted

_service:tar_scm:rust-1682340757.376c335.tar Added