From d0bd3e503c65e838bc8a0029869b0d5caa8ad5f8 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 17 Sep 2022 18:46:07 +0200
Subject: [PATCH 1/2] kodi: fix wrongly enabled internal ccache handling

Commit 98a96ef1f721e8a444a7769321a6185f156b6f46 ("kodi: use cmake")
incorrectly switched kodi's internal ccache usage from off to on,
resulting in the compiler being double-wrapped in ccache.

As our gcc ccache wrappers will get a new timestamp on each clean
rebuild this also meant ccache was practically disabled (as the
"compiler"'s mtime changed), leading to about 1400 cache misses,
unnecessary rebuilds, about 1GB of data being added to the cache
and rather long rebuild times.

Fix this by configuring kodi with -DENABLE_CCACHE=ON matching the
previous --disable-ccache we had before switching to cmake.

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/mediacenter/kodi/package.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk
index d568a504af..a4fd2578d5 100644
--- a/packages/mediacenter/kodi/package.mk
+++ b/packages/mediacenter/kodi/package.mk
@@ -229,7 +229,7 @@ configure_package() {
                          -DENABLE_UDEV=ON \
                          -DENABLE_DBUS=ON \
                          -DENABLE_XSLT=ON \
-                         -DENABLE_CCACHE=ON \
+                         -DENABLE_CCACHE=OFF \
                          -DENABLE_LIRCCLIENT=ON \
                          -DENABLE_EVENTCLIENTS=ON \
                          -DENABLE_LDGOLD=ON \

From 65de66afd89ba6df69771bd2d60c59ee3d0eb73f Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 17 Sep 2022 19:27:05 +0200
Subject: [PATCH 2/2] gcc: also install ccache wrapper for gcc:bootstrap

This allows glibc rebuilds to take advantage of ccache, too.

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 packages/lang/gcc/package.mk | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index 1105305cbd..61e352171f 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -78,6 +78,28 @@ PKG_CONFIGURE_OPTS_HOST="${GCC_COMMON_CONFIGURE_OPTS} \
                          --enable-clocale=gnu \
                          ${TARGET_ARCH_GCC_OPTS}"
 
+post_makeinstall_bootstrap() {
+  GCC_VERSION=$(${TOOLCHAIN}/bin/${TARGET_NAME}-gcc -dumpversion)
+  DATE="0401$(echo ${GCC_VERSION} | sed 's/\./0/g')"
+  CROSS_CC=${TARGET_PREFIX}gcc-${GCC_VERSION}
+
+  rm -f ${TARGET_PREFIX}gcc
+
+cat > ${TARGET_PREFIX}gcc <<EOF
+#!/bin/sh
+${TOOLCHAIN}/bin/ccache ${CROSS_CC} "\$@"
+EOF
+
+  chmod +x ${TARGET_PREFIX}gcc
+
+  # To avoid cache trashing
+  touch -c -t ${DATE} ${CROSS_CC}
+
+  # install lto plugin for binutils
+  mkdir -p ${TOOLCHAIN}/lib/bfd-plugins
+    ln -sf ../gcc/${TARGET_NAME}/${GCC_VERSION}/liblto_plugin.so ${TOOLCHAIN}/lib/bfd-plugins
+}
+
 pre_configure_host() {
   unset CPP
 }