From f5b29367af4d8e5daea5771264774aa49519f9a8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 28 Dec 2020 21:04:34 +0100 Subject: ccache.bbclass: use ccache from host distribution ccache 4.x has hard dependencies on cmake-native (used as build system) and zstd, which means inserting ccache-native as DEPENDS into everything creates circular dependencies which are impossible to break. ccache 3.x did not have this problem as it used plain makefiles and an in-tree copy of zlib. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/buildoptions.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/lib/oeqa/selftest/cases/buildoptions.py') diff --git a/meta/lib/oeqa/selftest/cases/buildoptions.py b/meta/lib/oeqa/selftest/cases/buildoptions.py index e91f0bd18f..d0f6477300 100644 --- a/meta/lib/oeqa/selftest/cases/buildoptions.py +++ b/meta/lib/oeqa/selftest/cases/buildoptions.py @@ -33,10 +33,10 @@ class ImageOptionsTests(OESelftestTestCase): self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) def test_ccache_tool(self): - bitbake("ccache-native") - bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native') - p = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] + "/" + "ccache" - self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p) + bb_vars = get_bb_vars(['HOSTTOOLS_DIR'], 'm4-native') + p = bb_vars['HOSTTOOLS_DIR'] + "/" + "ccache" + if not os.path.isfile(p): + self.skipTest("No ccache binary found in %s" % bb_vars['HOSTTOOLS_DIR']) self.write_config('INHERIT += "ccache"') self.add_command_to_tearDown('bitbake -c clean m4-native') bitbake("m4-native -c clean") -- cgit 1.2.3-korg