[patch] 0001-games-engines-devilutionx-fix-automagic-ccache-usage.patch

0001-games-engines-devilutionx-fix-automagic-ccache-usage.patch (text/plain), 2.68 KB, created by Sam James on 2022-03-22 22:06:24 UTC

From 784554627c212719673eebbd766a104571bc858e Mon Sep 17 00:00:00 2001
From: Sam James <[e-mail]>
Date: Tue, 22 Mar 2022 22:04:33 +0000
Subject: [PATCH] games-engines/devilutionx: fix automagic ccache usage

We let users enable this by themselves via e.g. FEATURES=ccache.

Closes: https://bugs.gentoo.org/813768
Signed-off-by: Sam James <[e-mail]>
---
 .../devilutionx/devilutionx-1.2.1-r1.ebuild     |  3 ++-
 .../devilutionx/devilutionx-9999.ebuild         |  3 ++-
 .../devilutionx-1.2.1-disable-ccache.patch      | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch

diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
index 9dd19f639bcb1..2a2abba3eba0f 100644
--- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
+++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
+	"${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768
 )
 
 DOCS=( docs/CHANGELOG.md )
diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild
index 9dd19f639bcb1..2a2abba3eba0f 100644
--- a/games-engines/devilutionx/devilutionx-9999.ebuild
+++ b/games-engines/devilutionx/devilutionx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508
+	"${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768
 )
 
 DOCS=( docs/CHANGELOG.md )
diff --git a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
new file mode 100644
index 0000000000000..d98bc8d2c9ee4
--- /dev/null
+++ b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch
@@ -0,0 +1,17 @@
+We let users enable ccache by themselves. Avoids sandbox violation.
+
+https://bugs.gentoo.org/813768
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,11 +54,6 @@ if(NOT VERSION_NUM)
+   endif()
+ endif()
+ 
+-find_program(CCACHE_PROGRAM ccache)
+-if(CCACHE_PROGRAM)
+-  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ if(VERSION_NUM MATCHES untagged)
+   project(DevilutionX
+     LANGUAGES C CXX)