开源软件构建与测试

_service:tar_scm:rust.spec Changed

@@ -1,7 +1,7 @@
-%global bootstrap_rust 1.78.0
-%global bootstrap_cargo 1.78.0
-%global bootstrap_channel 1.78.0
-%global bootstrap_date 2024-05-02
+%global bootstrap_rust 1.76.0
+%global bootstrap_cargo 1.76.0
+%global bootstrap_channel 1.76.0
+%global bootstrap_date 2024-02-08
 %bcond_with llvm_static
 %bcond_with bundled_llvm
 %bcond_without bundled_libgit2
@@ -10,8 +10,8 @@
 %bcond_without analyzer
 
 Name:                rust
-Version:             1.79.0
-Release:             1
+Version:             1.77.0
+Release:             5
 Summary:             The Rust Programming Language
 License:             Apache-2.0 OR MIT
 URL:                 https://www.rust-lang.org
@@ -23,7 +23,7 @@
 Source4:             cargo-config.sh
 Source5:             cargo-config.csh
 
-Patch0000:           rustc-1.79.0-disable-libssh2.patch
+Patch0000:           rustc-1.77.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.
@@ -45,6 +45,8 @@
     arch = "powerpc64le"
   elseif arch == "riscv64" then
     arch = "riscv64gc"
+  elseif arch == "loongarch64" then
+    arch = "loongarch64"
   end
   return arch.."-unknown-linux-"..abi
 end}
@@ -336,10 +338,13 @@
 test -r "%{profiler}"
 
 %configure --disable-option-checking \
-  --docdir=%{_pkgdocdir} \
   --libdir=%{common_libdir} \
+%ifarch loongarch64
+  --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
+%else
   %{rust_musl_root}=%{musl_root} \
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple},%{rust_musl_triple} \
+%endif
   --set target.%{rust_triple}.profiler="%{profiler}" \
   --python=%{python} \
   --local-rust-root=%{local_rust_root} \
@@ -383,15 +388,15 @@
 find %{buildroot}%{rustlibdir} -maxdepth 1 -type f -exec rm -v '{}' '+'
 find %{buildroot}%{rustlibdir} -type f -name '*.orig' -exec rm -v '{}' '+'
 find %{buildroot}%{rustlibdir}/src -type f -name '*.py' -exec rm -v '{}' '+'
-rm -f %{buildroot}%{_pkgdocdir}/README.md
-rm -f %{buildroot}%{_pkgdocdir}/COPYRIGHT
-rm -f %{buildroot}%{_pkgdocdir}/LICENSE
-rm -f %{buildroot}%{_pkgdocdir}/LICENSE-APACHE
-rm -f %{buildroot}%{_pkgdocdir}/LICENSE-MIT
-rm -f %{buildroot}%{_pkgdocdir}/LICENSE-THIRD-PARTY
-rm -f %{buildroot}%{_pkgdocdir}/*.old
-find %{buildroot}%{_pkgdocdir}/html -empty -delete
-find %{buildroot}%{_pkgdocdir}/html -type f -exec chmod -x '{}' '+'
+rm -f %{buildroot}%{_docdir}/%{name}/README.md
+rm -f %{buildroot}%{_docdir}/%{name}/COPYRIGHT
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-APACHE
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-MIT
+rm -f %{buildroot}%{_docdir}/%{name}/LICENSE-THIRD-PARTY
+rm -f %{buildroot}%{_docdir}/%{name}/*.old
+find %{buildroot}%{_docdir}/%{name}/html -empty -delete
+find %{buildroot}%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
 mkdir -p %{buildroot}%{_datadir}/cargo/registry
 mkdir -p %{buildroot}%{_docdir}/cargo
 ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html
@@ -415,11 +420,7 @@
 %check
 export %{rust_env}
 %{python} ./x.py test --no-fail-fast --stage 2 || :
-%ifarch aarch64
-# https://github.com/rust-lang/rust/issues/123733
-%define cargo_test_skip --test-args "--skip panic_abort_doc_tests"
-%endif
-%{python} ./x.py test --no-fail-fast --stage 2 cargo %{?cargo_test_skip} || :
+%{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 || :
@@ -429,7 +430,7 @@
 
 %files
 %license COPYRIGHT LICENSE-APACHE LICENSE-MIT
-%license %{_pkgdocdir}/html/*.txt
+%license %{_docdir}/%{name}/html/*.txt
 %doc README.md
 %{_bindir}/rustc
 %{_bindir}/rustdoc
@@ -441,20 +442,24 @@
 %{_libexecdir}/rust-analyzer-proc-macro-srv
 %endif
 %{rustlibdir}/%{rust_triple}/lib/*.so
+%ifnarch loongarch64
 %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
+%ifnarch loongarch64
 %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}
@@ -508,9 +513,9 @@
 %{rustlibdir}/src
 
 %files help
-%dir %{_pkgdocdir}
-%docdir %{_pkgdocdir}
-%{_pkgdocdir}/html
+%dir %{_docdir}/%{name}
+%docdir %{_docdir}/%{name}
+%{_docdir}/%{name}/html
 %dir %{_docdir}/cargo
 %docdir %{_docdir}/cargo
 %{_docdir}/cargo/html
@@ -519,14 +524,11 @@
 %{_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 <chunfu.jian@shingroup.cn> - 1.78.0-2
+* Thu Jun 13 2024 jianchunfu <chunfu.jian@shingroup.cn> - 1.77.0-5
 - spec: Add support for ppc64le
 
-* Tue May 07 2024 wangkai <13474090681@163.com> - 1.78.0-1
-- Update to 1.78.0
+* Wed Jun 05 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 1.77.0-4
+- disable musl for loongarch64
 
 * Mon Apr 22 2024 panchenbo <panchenbo@kylinsec.com.cn> - 1.77.0-3
 - Modify openEuler to vendor

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

@@ -4,23 +4,24 @@
 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(+)
+ compiler/rustc_target/src/spec/mod.rs           |  2 ++
+ .../src/spec/targets/ppc64le_unknown_freebsd.rs | 17 +++++++++++++++++
+ .../spec/targets/ppc64le_unknown_linux_gnu.rs   | 17 +++++++++++++++++
+ .../spec/targets/ppc64le_unknown_linux_musl.rs  | 17 +++++++++++++++++
+ src/bootstrap/configure.py                      |  2 ++
+ src/doc/rustc/src/platform-support.md           |  2 ++
+ vendor/openssl-src/src/lib.rs                   |  3 +++
+ vendor/target-lexicon/src/targets.rs            |  3 +++
+ 8 files changed, 63 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
+index 6c698c5b0..29575b9aa 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1513,6 +1513,8 @@ supported_targets! {
+@@ -1421,6 +1421,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),
@@ -31,10 +32,10 @@
      ("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
+index 000000000..41189b6fa
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_freebsd.rs
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,17 @@
 +use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions};
 +
 +pub fn target() -> Target {
@@ -46,12 +47,6 @@
 +
 +    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(),
@@ -60,10 +55,10 @@
 +}
 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
+index 000000000..f60b84447
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_gnu.rs
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,17 @@
 +use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions};
 +
 +pub fn target() -> Target {
@@ -75,12 +70,6 @@
 +
 +    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(),
@@ -89,10 +78,10 @@
 +}
 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
+index 000000000..d497b674b
 --- /dev/null
 +++ b/compiler/rustc_target/src/spec/targets/ppc64le_unknown_linux_musl.rs
-@@ -0,0 +1,23 @@
+@@ -0,0 +1,17 @@
 +use crate::spec::{base, Cc, LinkerFlavor, Lld, StackProbeType, Target, TargetOptions};
 +
 +pub fn target() -> Target {
@@ -104,12 +93,6 @@
 +
 +    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(),
@@ -117,10 +100,10 @@
 +    }
 +}
 diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 768aac9..155f21e 100755
+index d34c19a47..b6adafc5e 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",
+@@ -126,6 +126,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")
@@ -129,10 +112,25 @@
  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
+diff --git a/src/doc/rustc/src/platform-support.md b/src/doc/rustc/src/platform-support.md
+index f648a60b6..a905f27d7 100644
+--- a/src/doc/rustc/src/platform-support.md
++++ b/src/doc/rustc/src/platform-support.md
+@@ -330,8 +330,10 @@ target | std | host | notes
+ `powerpc-wrs-vxworks` | ? |  |
+ `powerpc64-unknown-freebsd` | ✓ | ✓ | PPC64 FreeBSD (ELFv1 and ELFv2)
+ `powerpc64le-unknown-freebsd` |   |   | PPC64LE FreeBSD
++`ppc64le-unknown-freebsd` |   |   | PPC64LE FreeBSD
+ `powerpc-unknown-freebsd` |   |   | PowerPC FreeBSD
+ `powerpc64-unknown-linux-musl` | ? |  |
++`ppc64le-unknown-linux-musl` | ? |  |
+ `powerpc64-wrs-vxworks` | ? |  |
+ `powerpc64le-unknown-linux-musl` | ? |  |
+ `powerpc64-unknown-openbsd`(platform-support/openbsd.md) | ✓ | ✓ | OpenBSD/powerpc64
+diff --git a/vendor/openssl-src/src/lib.rs b/vendor/openssl-src/src/lib.rs
+index 1264742dc..14427a70e 100644
+--- a/vendor/openssl-src/src/lib.rs
++++ b/vendor/openssl-src/src/lib.rs
 @@ -282,6 +282,9 @@ impl Build {
              "powerpc64le-unknown-freebsd" => "BSD-generic64",
              "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
@@ -143,11 +141,11 @@
              "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/src/targets.rs b/vendor/target-lexicon/src/targets.rs
+index d03d202a0..7d7c0ee95 100644
+--- a/vendor/target-lexicon/src/targets.rs
++++ b/vendor/target-lexicon/src/targets.rs
+@@ -1624,6 +1624,9 @@ mod tests {
              "powerpc64le-unknown-freebsd",
              "powerpc64le-unknown-linux-gnu",
              "powerpc64le-unknown-linux-musl",

_service:tar_scm:rustc-1.79.0-disable-libssh2.patch -> _service:tar_scm:rustc-1.77.0-disable-libssh2.patch Changed

@@ -1,7 +1,7 @@
-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
+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-02-14 14:06:05.881165093 +0100
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2024-02-14 14:06:27.169456166 +0100
+@@ -2072,7 +2072,6 @@ checksum = "ee4126d8b4ee5c9d9ea891dd875c
  dependencies = 
   "cc",
   "libc",
@@ -9,7 +9,7 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -2191,20 +2190,6 @@ dependencies = 
+@@ -2113,20 +2112,6 @@ dependencies = 
   "pkg-config",
   "vcpkg",
  
@@ -30,15 +30,15 @@
  
  package
  name = "libz-sys"
-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"
+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-02-14 14:06:10.400226884 +0100
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2024-02-14 14:06:51.225785086 +0100
+@@ -44,7 +44,7 @@ curl = "0.4.44"
+ curl-sys = "0.4.70"
  filetime = "0.2.23"
  flate2 = { version = "1.0.28", default-features = false, features = "zlib" }
--git2 = "0.18.3"
-+git2 = { version = "0.18.3", default-features = false, features = "https" }
+-git2 = "0.18.2"
++git2 = { version = "0.18.2", 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" }
- glob = "0.3.1"
+ gix = { version = "0.57.1", default-features = false, features = "blocking-http-transport-curl", "progress-tree", "revision" }
+ gix-features-for-configuration-only = { version = "0.37.1", package = "gix-features", features =  "parallel"  }

_service Changed

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

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

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

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

Changes of Revision 2