From 2ea0f82e5f9bb21d21503ed06cf74153ae8cbcc7 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Thu, 7 Aug 2025 19:50:45 +0200 Subject: [PATCH] ccache: do not use ccache if it is explicitly forbidden Some recipes explicitly disable ccache via CCACHE_DISABLE variable since they are known issues with ccache in those recipes. This setting should not be ignored also when ccache in in HOSTOOLS. Rework a hard to read if clause so that it is in format if (not CCACHE_DISABLE and (cond1 or cond2 or cond2)): Signed-off-by: Peter Marko Signed-off-by: Mathieu Dubois-Briand --- meta/classes/ccache.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/ccache.bbclass b/meta/classes/ccache.bbclass index 5ce23e50f34..f6bd972ff42 100644 --- a/meta/classes/ccache.bbclass +++ b/meta/classes/ccache.bbclass @@ -51,10 +51,10 @@ python() { Enable ccache for the recipe """ pn = d.getVar('PN') - if ("ccache" in d.getVar("HOSTTOOLS").split() or + if (not bb.utils.to_boolean(d.getVar('CCACHE_DISABLE')) and + ("ccache" in d.getVar("HOSTTOOLS").split() or pn in d.getVar('CCACHE_NATIVE_RECIPES_ALLOWED') or - not (bb.data.inherits_class("native", d) or - bb.utils.to_boolean(d.getVar('CCACHE_DISABLE')))): + not bb.data.inherits_class("native", d))): d.appendVar('DEPENDS', ' ccache-native') d.setVar('CCACHE', 'ccache ') } -- 2.47.3