summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-12-28 21:04:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-31 11:53:26 +0000
commit95c76b9bd458a10277c9df37d15d86203ec8f10f (patch)
tree6f0937d7ea784cbc0b0f820920c7e373af38091f /meta/lib
parent2ccb91bc740878f030002fb1a373a708bd125645 (diff)
downloadpoky-95c76b9bd458a10277c9df37d15d86203ec8f10f.tar.gz
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. (From OE-Core rev: f5b29367af4d8e5daea5771264774aa49519f9a8) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/selftest/cases/buildoptions.py8
1 files changed, 4 insertions, 4 deletions
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):
33 self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed) 33 self.assertTrue(incremental_removed, msg = "Match failed in:\n%s" % log_data_removed)
34 34
35 def test_ccache_tool(self): 35 def test_ccache_tool(self):
36 bitbake("ccache-native") 36 bb_vars = get_bb_vars(['HOSTTOOLS_DIR'], 'm4-native')
37 bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'bindir'], 'ccache-native') 37 p = bb_vars['HOSTTOOLS_DIR'] + "/" + "ccache"
38 p = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] + "/" + "ccache" 38 if not os.path.isfile(p):
39 self.assertTrue(os.path.isfile(p), msg = "No ccache found (%s)" % p) 39 self.skipTest("No ccache binary found in %s" % bb_vars['HOSTTOOLS_DIR'])
40 self.write_config('INHERIT += "ccache"') 40 self.write_config('INHERIT += "ccache"')
41 self.add_command_to_tearDown('bitbake -c clean m4-native') 41 self.add_command_to_tearDown('bitbake -c clean m4-native')
42 bitbake("m4-native -c clean") 42 bitbake("m4-native -c clean")