[PR PATCH] ccache: update to 4.10.1.

[PR PATCH] ccache: update to 4.10.1.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 591 bytes --]

There is a new pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages ccache
https://github.com/void-linux/void-packages/pull/51318

ccache: update to 4.10.1.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

A patch file from https://github.com/void-linux/void-packages/pull/51318.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-51318.patch --]
[-- Type: text/x-diff, Size: 2664 bytes --]

From ad5f656ab3df33c0ba714e13a9ac2a324e51b90b Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Thu, 18 Jul 2024 09:22:32 +0200
Subject: [PATCH] ccache: update to 4.10.1.

---
 srcpkgs/ccache/patches/ioctl.patch | 18 ++++++++++++++++++
 srcpkgs/ccache/template            |  8 ++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/ccache/patches/ioctl.patch

diff --git a/srcpkgs/ccache/patches/ioctl.patch b/srcpkgs/ccache/patches/ioctl.patch
new file mode 100644
index 00000000000000..711650eb060358
--- /dev/null
+++ b/srcpkgs/ccache/patches/ioctl.patch
@@ -0,0 +1,18 @@
+musl uses an `int` instead of a `unsigend long` for the ioctl function
+prototype, contrary to glibc, since POSIX mandates the former. This
+causes a spurious error on ppc64le which can be silenced by casting to
+int explicitly.
+
+See https://www.openwall.com/lists/musl/2020/01/20/2
+
+diff -upr a/src/ccache/storage/local/LocalStorage.cpp b/src/ccache/storage/local/LocalStorage.cpp
+--- a/src/ccache/storage/local/LocalStorage.cpp	2024-06-30 20:46:01.000000000 +0200
++++ b/src/ccache/storage/local/LocalStorage.cpp	2024-07-03 16:29:39.073705276 +0200
+@@ -264,7 +264,7 @@ clone_file(const std::string& src, const
+     }
+   }
+ 
+-  if (ioctl(*dest_fd, FICLONE, *src_fd) != 0) {
++  if (ioctl(*dest_fd, (int)FICLONE, *src_fd) != 0) {
+     throw core::Error(strerror(errno));
+   }
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 3127df42cf13d1..f60fde9d986501 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,11 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=4.8.3
+version=4.10.1
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTING=OFF -DREDIS_STORAGE_BACKEND=OFF
  -DENABLE_DOCUMENTATION=OFF"
-makedepends="libzstd-devel"
+makedepends="libzstd-devel xxHash-devel"
 short_desc="Fast C/C++ Compiler Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -13,8 +13,8 @@ homepage="https://ccache.dev"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}.tar.xz
  https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}-linux-x86_64.tar.xz"
-checksum="e47374c810b248cfca3665ee1d86c7c763ffd68d9944bc422d9c1872611f2b11
- 1021f6dc9641447524cc7bceb72f807f2d6502df118d69dc3f0f86cacf048e79"
+checksum="3a43442ce3916ea48bb6ccf6f850891cbff01d1feddff7cd4bbd49c5cf1188f6
+ 1733deb871116b7907c42fad6ae1f224e4a482e2a0a429a1300e992412c882c2"
 
 if [ -n "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DENABLE_TESTING=ON"

Re: ccache: update to 4.10.1.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/51318#issuecomment-2235813463

Comment:
Upcoming downloads and the issues did not happen while building locally. :thinking: 

Re: ccache: update to 4.10.1.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/51318#issuecomment-2235813463

Comment:
Upcoming downloads and the corresponding issues did not happen while building locally. :thinking: 

Re: ccache: update to 4.10.1.

[meator]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/51318#issuecomment-2240988295

Comment:
It looks like `doctest-devel` is missing in `makedepends`. I would also add `-DDEPS=LOCAL` to `configure_args`.

Also, [the compiler can't be `cc`, it must be set to `gcc` instead](https://github.com/ccache/ccache/blob/v4.10.1/test/run#L547-L559). This issue should be pretty easy to fix upstream, maybe it's worth reporting.

Re: ccache: update to 4.10.1.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/51318#issuecomment-2245580266

Comment:
Hey @meator,

thank you for the help.

Could you explain to me a bit further what you mean with the link to the line you added? I don't see the use of `cc` there.

Re: [PR PATCH] [Updated] ccache: update to 4.10.1.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages ccache
https://github.com/void-linux/void-packages/pull/51318

ccache: update to 4.10.1.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

A patch file from https://github.com/void-linux/void-packages/pull/51318.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-51318.patch --]
[-- Type: text/x-diff, Size: 2723 bytes --]

From 44878dcb3cc2f149fd215f312138788b5b6c2ea1 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 23 Jul 2024 17:38:27 +0200
Subject: [PATCH] ccache: update to 4.10.2.

---
 srcpkgs/ccache/patches/ioctl.patch | 18 ++++++++++++++++++
 srcpkgs/ccache/template            | 10 +++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ccache/patches/ioctl.patch

diff --git a/srcpkgs/ccache/patches/ioctl.patch b/srcpkgs/ccache/patches/ioctl.patch
new file mode 100644
index 00000000000000..711650eb060358
--- /dev/null
+++ b/srcpkgs/ccache/patches/ioctl.patch
@@ -0,0 +1,18 @@
+musl uses an `int` instead of a `unsigend long` for the ioctl function
+prototype, contrary to glibc, since POSIX mandates the former. This
+causes a spurious error on ppc64le which can be silenced by casting to
+int explicitly.
+
+See https://www.openwall.com/lists/musl/2020/01/20/2
+
+diff -upr a/src/ccache/storage/local/LocalStorage.cpp b/src/ccache/storage/local/LocalStorage.cpp
+--- a/src/ccache/storage/local/LocalStorage.cpp	2024-06-30 20:46:01.000000000 +0200
++++ b/src/ccache/storage/local/LocalStorage.cpp	2024-07-03 16:29:39.073705276 +0200
+@@ -264,7 +264,7 @@ clone_file(const std::string& src, const
+     }
+   }
+ 
+-  if (ioctl(*dest_fd, FICLONE, *src_fd) != 0) {
++  if (ioctl(*dest_fd, (int)FICLONE, *src_fd) != 0) {
+     throw core::Error(strerror(errno));
+   }
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 3127df42cf13d1..fe2a03f1b260d6 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,11 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=4.8.3
+version=4.10.2
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTING=OFF -DREDIS_STORAGE_BACKEND=OFF
- -DENABLE_DOCUMENTATION=OFF"
-makedepends="libzstd-devel"
+ -DENABLE_DOCUMENTATION=OFF -DDEPS=LOCAL"
+makedepends="libzstd-devel xxHash-devel doctest-devel"
 short_desc="Fast C/C++ Compiler Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -13,8 +13,8 @@ homepage="https://ccache.dev"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}.tar.xz
  https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}-linux-x86_64.tar.xz"
-checksum="e47374c810b248cfca3665ee1d86c7c763ffd68d9944bc422d9c1872611f2b11
- 1021f6dc9641447524cc7bceb72f807f2d6502df118d69dc3f0f86cacf048e79"
+checksum="c0b85ddfc1a3e77b105ec9ada2d24aad617fa0b447c6a94d55890972810f0f5a
+ 80cab87bd510eca796467aee8e663c398239e0df1c4800a0b5dff11dca0b4f18"
 
 if [ -n "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DENABLE_TESTING=ON"

Re: [PR PATCH] [Updated] ccache: update to 4.10.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages ccache
https://github.com/void-linux/void-packages/pull/51318

ccache: update to 4.10.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

A patch file from https://github.com/void-linux/void-packages/pull/51318.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-51318.patch --]
[-- Type: text/x-diff, Size: 2723 bytes --]

From 9d8203ee87cc42f1d51947d085c1701af94bbeac Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 23 Jul 2024 17:44:34 +0200
Subject: [PATCH] ccache: update to 4.10.2.

---
 srcpkgs/ccache/patches/ioctl.patch | 18 ++++++++++++++++++
 srcpkgs/ccache/template            | 10 +++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ccache/patches/ioctl.patch

diff --git a/srcpkgs/ccache/patches/ioctl.patch b/srcpkgs/ccache/patches/ioctl.patch
new file mode 100644
index 00000000000000..711650eb060358
--- /dev/null
+++ b/srcpkgs/ccache/patches/ioctl.patch
@@ -0,0 +1,18 @@
+musl uses an `int` instead of a `unsigend long` for the ioctl function
+prototype, contrary to glibc, since POSIX mandates the former. This
+causes a spurious error on ppc64le which can be silenced by casting to
+int explicitly.
+
+See https://www.openwall.com/lists/musl/2020/01/20/2
+
+diff -upr a/src/ccache/storage/local/LocalStorage.cpp b/src/ccache/storage/local/LocalStorage.cpp
+--- a/src/ccache/storage/local/LocalStorage.cpp	2024-06-30 20:46:01.000000000 +0200
++++ b/src/ccache/storage/local/LocalStorage.cpp	2024-07-03 16:29:39.073705276 +0200
+@@ -264,7 +264,7 @@ clone_file(const std::string& src, const
+     }
+   }
+ 
+-  if (ioctl(*dest_fd, FICLONE, *src_fd) != 0) {
++  if (ioctl(*dest_fd, (int)FICLONE, *src_fd) != 0) {
+     throw core::Error(strerror(errno));
+   }
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 3127df42cf13d1..fe2a03f1b260d6 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,11 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=4.8.3
+version=4.10.2
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTING=OFF -DREDIS_STORAGE_BACKEND=OFF
- -DENABLE_DOCUMENTATION=OFF"
-makedepends="libzstd-devel"
+ -DENABLE_DOCUMENTATION=OFF -DDEPS=LOCAL"
+makedepends="libzstd-devel xxHash-devel doctest-devel"
 short_desc="Fast C/C++ Compiler Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -13,8 +13,8 @@ homepage="https://ccache.dev"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}.tar.xz
  https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}-linux-x86_64.tar.xz"
-checksum="e47374c810b248cfca3665ee1d86c7c763ffd68d9944bc422d9c1872611f2b11
- 1021f6dc9641447524cc7bceb72f807f2d6502df118d69dc3f0f86cacf048e79"
+checksum="c0b85ddfc1a3e77b105ec9ada2d24aad617fa0b447c6a94d55890972810f0f5a
+ 80cab87bd510eca796467aee8e663c398239e0df1c4800a0b5dff11dca0b4f18"
 
 if [ -n "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DENABLE_TESTING=ON"

Re: ccache: update to 4.10.2.

[meator]

[-- Attachment #1: Type: text/plain, Size: 1538 bytes --]

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/51318#issuecomment-2245764352

Comment:
> I don't see the use of `cc` there.

Well that's the problem. The test runner tries to run `$CC --version` which resolves to `cc --version` under current circumstances so this gets outputted:

```
cc (GCC) 13.2.0
Copyright (C) 2023 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
```

Only the first line is important (thanks to `head -1`). `gcc` is actually mentioned in the first line, but it's `GCC` and the [glob I've linked](https://github.com/ccache/ccache/blob/v4.10.1/test/run#L547-L559) is case sensitive, so it falls back to `*` default branch which **skips and invalidates all tests**.

The first branch (`*gcc*|*g++*|2.95*`) should be run here. This means that either `test/run` has to be modified or `$CC` has to be modified. If I were responsible for this update, I would try to set `$CC` to `gcc` in the template (this isn't a breaking change because `cc` = `gcc`, `cc` is a symlink to it[^1]) and I would make an issue in the upstream repository requesting to add `*GCC*` to the first branch (or some similar solution).

[^1]: This means that `cc` and `gcc` are _almost_ identical. One of the few factors that separate them, program name (the zeroth argument of the command line `$0`) is unfortunately the one causing trouble here.

Re: [PR PATCH] [Updated] ccache: update to 4.10.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages ccache
https://github.com/void-linux/void-packages/pull/51318

ccache: update to 4.10.2.
#### Testing the changes
- I tested the changes in this PR: **briefly**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

A patch file from https://github.com/void-linux/void-packages/pull/51318.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ccache-51318.patch --]
[-- Type: text/x-diff, Size: 2931 bytes --]

From 768b7931bd19048ff86c3fff3b152265a2b28cff Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 24 Sep 2024 14:37:27 +0200
Subject: [PATCH] ccache: update to 4.10.2.

---
 srcpkgs/ccache/patches/ioctl.patch | 18 ++++++++++++++++++
 srcpkgs/ccache/template            | 16 +++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/ccache/patches/ioctl.patch

diff --git a/srcpkgs/ccache/patches/ioctl.patch b/srcpkgs/ccache/patches/ioctl.patch
new file mode 100644
index 00000000000000..711650eb060358
--- /dev/null
+++ b/srcpkgs/ccache/patches/ioctl.patch
@@ -0,0 +1,18 @@
+musl uses an `int` instead of a `unsigend long` for the ioctl function
+prototype, contrary to glibc, since POSIX mandates the former. This
+causes a spurious error on ppc64le which can be silenced by casting to
+int explicitly.
+
+See https://www.openwall.com/lists/musl/2020/01/20/2
+
+diff -upr a/src/ccache/storage/local/LocalStorage.cpp b/src/ccache/storage/local/LocalStorage.cpp
+--- a/src/ccache/storage/local/LocalStorage.cpp	2024-06-30 20:46:01.000000000 +0200
++++ b/src/ccache/storage/local/LocalStorage.cpp	2024-07-03 16:29:39.073705276 +0200
+@@ -264,7 +264,7 @@ clone_file(const std::string& src, const
+     }
+   }
+ 
+-  if (ioctl(*dest_fd, FICLONE, *src_fd) != 0) {
++  if (ioctl(*dest_fd, (int)FICLONE, *src_fd) != 0) {
+     throw core::Error(strerror(errno));
+   }
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 3127df42cf13d1..640e1b6f80b514 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,11 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=4.8.3
+version=4.10.2
 revision=1
 build_style=cmake
 configure_args="-DENABLE_TESTING=OFF -DREDIS_STORAGE_BACKEND=OFF
- -DENABLE_DOCUMENTATION=OFF"
-makedepends="libzstd-devel"
+ -DENABLE_DOCUMENTATION=OFF -DDEPS=LOCAL"
+makedepends="libzstd-devel xxHash-devel doctest-devel"
 short_desc="Fast C/C++ Compiler Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -13,10 +13,12 @@ homepage="https://ccache.dev"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}.tar.xz
  https://github.com/ccache/ccache/releases/download/v${version}/ccache-${version}-linux-x86_64.tar.xz"
-checksum="e47374c810b248cfca3665ee1d86c7c763ffd68d9944bc422d9c1872611f2b11
- 1021f6dc9641447524cc7bceb72f807f2d6502df118d69dc3f0f86cacf048e79"
+checksum="c0b85ddfc1a3e77b105ec9ada2d24aad617fa0b447c6a94d55890972810f0f5a
+ 80cab87bd510eca796467aee8e663c398239e0df1c4800a0b5dff11dca0b4f18"
+
 
 if [ -n "$XBPS_CHECK_PKGS" ]; then
+	makedepends+=" perl"
 	configure_args+=" -DENABLE_TESTING=ON"
 fi
 
@@ -24,6 +26,10 @@ post_extract() {
 	mv ccache-${version}/* .
 }
 
+pre_check() {
+	export CC=/usr/bin/gcc
+}
+
 post_install() {
 	vmkdir usr/lib/ccache/bin
 	# clang

Re: ccache: update to 4.10.2.

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New comment by dataCobra on void-packages repository

https://github.com/void-linux/void-packages/pull/51318#issuecomment-2371158400

Comment:
Thank you for the detailed explanation.

I've changed the template accordingly and testing does work now.

Re: [PR PATCH] [Closed]: ccache: update to 4.10.2.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 437 bytes --]

There's a closed pull request on the void-packages repository

ccache: update to 4.10.2.
https://github.com/void-linux/void-packages/pull/51318

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686