Re: [PR PATCH] [Updated] ccache: update to 4.0

[pullmoll <pullmoll@users.noreply.github.com>]

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

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

https://github.com/pullmoll/void-packages ccache
https://github.com/void-linux/void-packages/pull/25724

ccache: update to 4.0
This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).

I think we cannot turn `cmake` into a `bootstrap=yes` package.
Should we create a (legacy) chroot-ccache with a < 4.0 version?

There seems to be no way to build `ccache` >= 4.0 with just autoconf.

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

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

From 9fa76323d8d86b5c0746ae2e50f80ff9aad8d323 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:01:57 +0200
Subject: [PATCH 1/2] ccache: update to 4.0

This release changes from using autoconf to cmake which is why
we need to remove the bootstrap=yes (N.B.: cmake is not bootstrap=yes).
---
 srcpkgs/ccache/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index 481c4466199..f290805e3ec 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -1,11 +1,9 @@
 # Template file for 'ccache'
 pkgname=ccache
-version=3.7.12
+version=4.0
 revision=1
-bootstrap=yes
-build_style=gnu-configure
-make_check_args="CC=gcc"
-makedepends="zlib-devel"
+build_style=cmake
+makedepends="libzstd-devel zlib-devel"
 checkdepends="perl"
 short_desc="Fast C/C++ Compiler Cache"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -13,7 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://ccache.samba.org/"
 changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=a02f4e8360dc6618bc494ca35b0ae21cea080f804a4898eab1ad3fcd108eb400
+checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
 
 post_install() {
 	vmkdir usr/lib/ccache/bin

From b352b32aa198c73626c761f323afac93badf6960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sun, 18 Oct 2020 22:03:25 +0200
Subject: [PATCH 2/2] base-chroot: remove ccache dependency

Because ccache >= 4.0 now is built using cmake, ccache can no longer
be a bootstrap=yes package. We would need to (re-)introduce a
chroot-ccache < 4.0 package or make cmake also a bootstrap=yes package.

I am undecided what to do. For now remove ccache from the base-chroot files.
---
 srcpkgs/base-chroot/template |  4 ++--
 srcpkgs/ccache/template      | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 78f6d0cc2a1..aad7e4aed5b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
 # Template file for 'base-chroot'
 pkgname=base-chroot
 version=0.66
-revision=3
+revision=4
 bootstrap=yes
 build_style=meta
 short_desc="Minimal set of packages required for chroot with xbps-src"
@@ -17,6 +17,6 @@ esac
 depends+="
  base-files binutils gcc gcc-ada libada-devel
  patch sed findutils diffutils make gzip coreutils
- file bsdtar ccache xbps mpfr ncurses libreadline8
+ file bsdtar xbps mpfr ncurses libreadline8
  chroot-bash chroot-grep chroot-gawk chroot-distcc
  chroot-util-linux chroot-git"
diff --git a/srcpkgs/ccache/template b/srcpkgs/ccache/template
index f290805e3ec..6a52f33be93 100644
--- a/srcpkgs/ccache/template
+++ b/srcpkgs/ccache/template
@@ -13,6 +13,17 @@ changelog="https://ccache.dev/releasenotes.html"
 distfiles="https://github.com/ccache/ccache/releases/download/v${version}/${pkgname}-${version}.tar.xz"
 checksum=ac1b82fe0a5e39905945c4d68fcb24bd0f32344869faf647a1b8d31e544dcb88
 
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+		vsed -i src/CMakeLists.txt \
+			-e "/add_library/a target_link_libraries(ccache_lib PRIVATE atomic)"
+	fi
+}
+
 post_install() {
 	vmkdir usr/lib/ccache/bin
 	# clang