[rpms/rust-sccache] rawhide: Fix building on ppc64le and s390x

[Andreas Schneider <asn@redhat.com>]

A new commit has been pushed.

Repo   : rpms/rust-sccache
Branch : rawhide
Commit : 6cb2e0816c301a556d24dd5cf25d9da893e1a690
Author : Andreas Schneider <asn@redhat.com>
Date   : 2026-06-23T12:34:31+02:00
Stats  : +41/-2 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-sccache/c/6cb2e0816c301a556d24dd5cf25d9da893e1a690?branch=rawhide

Log:
Fix building on ppc64le and s390x

---
diff --git a/rust-sccache.spec b/rust-sccache.spec
index 84da037..ab65fb6 100644
--- a/rust-sccache.spec
+++ b/rust-sccache.spec
@@ -24,6 +24,9 @@ Patch:          sccache-fix-metadata-auto.diff
 # * Allow serde_json version 1.0.149
 # * Allow tokio-serde version < 1.0
 Patch:          sccache-fix-metadata.diff
+# * Fix build on ppc64le and s390x -
+#   https://github.com/mozilla/sccache/pull/2749
+Patch10:        sccache-fix-ppc64le-and-s390x.patch
 
 BuildRequires:  cargo-rpm-macros >= 26
 

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 285690a..0cf59fa 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -9,6 +9,11 @@ cargo-toml-patch-comments = [
 ]
 cargo-install-lib = false
 
+[[package.extra-patches]]
+number = 10
+file = "sccache-fix-ppc64le-and-s390x.patch"
+comments = [ "Fix build on ppc64le and s390x - https://github.com/mozilla/sccache/pull/2749" ]
+
 [scripts.prep]
 post = [
     "rm -f tests/oauth.rs",

diff --git a/sccache-fix-metadata-auto.diff b/sccache-fix-metadata-auto.diff
index ca992cb..49a7dce 100644
--- a/sccache-fix-metadata-auto.diff
+++ b/sccache-fix-metadata-auto.diff
@@ -1,5 +1,5 @@
 --- sccache-0.16.0/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ sccache-0.16.0/Cargo.toml	2026-06-19T13:17:48.338983+00:00
++++ sccache-0.16.0/Cargo.toml	2026-06-23T10:34:15.119544+00:00
 @@ -476,17 +476,6 @@
  [target."cfg(unix)".dependencies.daemonix]
  version = "0.1"

diff --git a/sccache-fix-metadata.diff b/sccache-fix-metadata.diff
index 4d7c330..fcc0e4b 100644
--- a/sccache-fix-metadata.diff
+++ b/sccache-fix-metadata.diff
@@ -1,5 +1,5 @@
 --- sccache-0.16.0/Cargo.toml	2006-07-24T01:21:28+00:00
-+++ sccache-0.16.0/Cargo.toml	2026-06-19T13:18:01.892769+00:00
++++ sccache-0.16.0/Cargo.toml	2026-06-23T10:34:15.122203+00:00
 @@ -27,7 +27,7 @@
      "command-line-utilities",
      "development-tools::build-utils",

diff --git a/sccache-fix-ppc64le-and-s390x.patch b/sccache-fix-ppc64le-and-s390x.patch
new file mode 100644
index 0000000..6c27d45
--- /dev/null
+++ b/sccache-fix-ppc64le-and-s390x.patch
@@ -0,0 +1,31 @@
+From 7e13e2f2600bfefd6ddaf6b9e0a51707da3fc831 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Tue, 23 Jun 2026 08:51:27 +0200
+Subject: [PATCH] fix: Fix ToolchainPackager cfg gate to build on ppc64le/s390x
+
+On Linux ppc64le/s390x, the blanket
+`impl<T: Send> ToolchainPackager for T` in pkg.rs is active
+(non-x86_64/aarch64 path), but the test-only
+PanicToolchainPackager impl in cache.rs was gated on only
+`target_os = "linux"`, causing a conflicting-impl error on
+those architectures.
+---
+ src/dist/cache.rs | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/dist/cache.rs b/src/dist/cache.rs
+index 72e9c3d66..e5db21b72 100644
+--- a/src/dist/cache.rs
++++ b/src/dist/cache.rs
+@@ -302,7 +302,10 @@ mod client {
+                 Box::new(PanicToolchainPackager)
+             }
+         }
+-        #[cfg(target_os = "linux")]
++        #[cfg(all(
++            target_os = "linux",
++            any(target_arch = "x86_64", target_arch = "aarch64")
++        ))]
+         impl crate::dist::pkg::ToolchainPackager for PanicToolchainPackager {
+             fn write_pkg(self: Box<Self>, _f: super::fs::File) -> crate::errors::Result<()> {
+                 panic!("should not have called packager")