Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sccache for openSUSE:Factory checked
in at 2022-03-28 17:00:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sccache (Old)
and /work/SRC/openSUSE:Factory/.sccache.new.1900 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sccache"
Mon Mar 28 17:00:39 2022 rev:16 rq:965123 version:0.2.15~git0.6b6d2f7
Changes:
--------
--- /work/SRC/openSUSE:Factory/sccache/sccache.changes 2022-03-15
19:05:24.780968173 +0100
+++ /work/SRC/openSUSE:Factory/.sccache.new.1900/sccache.changes
2022-03-28 17:01:31.949048546 +0200
@@ -1,0 +2,13 @@
+Sun Mar 27 01:25:36 UTC 2022 - William Brown <william.br...@suse.com>
+
+- 0001-Ignore-some-env-vars.patch - sccache will ignore rebuilds if
+ env vars change. As a result, we need to filter a number of values
+ that rpm/osc-build injects that change frequently that disrupts
+ the ability for sccache to cache effectively.
+
+-------------------------------------------------------------------
+Fri Mar 25 05:23:56 UTC 2022 - William Brown <william.br...@suse.com>
+
+- Ungate sccache from other arches
+
+-------------------------------------------------------------------
New:
----
0001-Ignore-some-env-vars.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sccache.spec ++++++
--- /var/tmp/diff_new_pack.GmPQvU/_old 2022-03-28 17:01:32.673049530 +0200
+++ /var/tmp/diff_new_pack.GmPQvU/_new 2022-03-28 17:01:32.677049535 +0200
@@ -33,10 +33,10 @@
Source12: builder.conf
Source13: scheduler.conf
Source14: client.example
+Patch1: 0001-Ignore-some-env-vars.patch
BuildRequires: cargo-packaging
BuildRequires: pkgconfig(openssl)
Requires: bubblewrap
-ExclusiveArch: x86_64 i586 i686 %{arm} aarch64 s390x
%description
Sccache is a ccache-like tool. It is used as a compiler wrapper and
@@ -47,24 +47,27 @@
%prep
%setup -q
%setup -qa1
+%patch1 -p1
+
mkdir .cargo
cp %{SOURCE2} .cargo/config
# Remove exec bits to prevent an issue in fedora shebang checking
find vendor -type f -name \*.rs -exec chmod -x '{}' \;
%build
-# 'dist-server' available only on x86_64 so far -
https://github.com/mozilla/sccache/issues/656
-features="azure,s3,memcached,redis"
-
%ifarch x86_64
-features="$features,dist-server,dist-client"
-%endif
-# s390x can NOT build gcs support, ring fails. Use FS only
-%ifarch s390x
+# 'dist-server' available only on x86_64 so far -
https://github.com/mozilla/sccache/issues/656
+features="azure,s3,redis,dist-server,dist-client"
+%else
+%ifarch aarch64
+features="azure,s3,redis"
+%else
+# Most other arches have issues (especially with ring). Use FS cache only
features=""
%endif
+%endif
-%{cargo_build} --features=$features
+%{cargo_build} --no-default-features --features=$features
%install
install -D -d -m 0755 %{buildroot}%{_bindir}
++++++ 0001-Ignore-some-env-vars.patch ++++++
>From b1af4f10aa3ec94b2f16d092cfd9f0025a1c5f58 Mon Sep 17 00:00:00 2001
From: William Brown <will...@blackhats.net.au>
Date: Sun, 27 Mar 2022 11:19:09 +1000
Subject: [PATCH] Ignore some env vars
---
src/cmdline.rs | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/cmdline.rs b/src/cmdline.rs
index 13773c7..bd89cb3 100644
--- a/src/cmdline.rs
+++ b/src/cmdline.rs
@@ -208,7 +208,19 @@ pub fn parse() -> Result<Command> {
//
// FIXME: Maybe we should strip out `LD_PRELOAD` always?
if env::var_os("RUNNING_UNDER_RR").is_some() {
- env_vars.retain(|(k, _v)| k != "LD_PRELOAD" && k !=
"RUNNING_UNDER_RR");
+ env_vars.retain(|(k, _v)|
+ k != "LD_PRELOAD" &&
+ k != "RUNNING_UNDER_RR" &&
+ k != "HOSTNAME" &&
+ k != "PWD" &&
+ k != "HOST" &&
+ k != "RPM_BUILD_ROOT" &&
+ k != "SOURCE_DATE_EPOCH" &&
+ k != "RPM_PACKAGE_RELEASE" &&
+ k != "MINICOM" &&
+ k != "DESTDIR" &&
+ k != "RPM_PACKAGE_VERSION"
+ );
}
Ok(Command::Compile {
--
2.32.0 (Apple Git-132)
