summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/cmake.bbclass21
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb3
-rw-r--r--meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb3
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.22.5.bb3
4 files changed, 24 insertions, 6 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index f22d90a1d5..fa7f68c99b 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -4,9 +4,6 @@ OECMAKE_SOURCEPATH ??= "${S}"
4DEPENDS_prepend = "cmake-native " 4DEPENDS_prepend = "cmake-native "
5B = "${WORKDIR}/build" 5B = "${WORKDIR}/build"
6 6
7# We need to unset CCACHE otherwise cmake gets too confused
8CCACHE = ""
9
10# What CMake generator to use. 7# What CMake generator to use.
11# The supported options are "Unix Makefiles" or "Ninja". 8# The supported options are "Unix Makefiles" or "Ninja".
12OECMAKE_GENERATOR ?= "Ninja" 9OECMAKE_GENERATOR ?= "Ninja"
@@ -23,10 +20,22 @@ python() {
23 d.setVarFlag("do_compile", "progress", r"outof:^\[(\d+)/(\d+)\]\s+") 20 d.setVarFlag("do_compile", "progress", r"outof:^\[(\d+)/(\d+)\]\s+")
24 else: 21 else:
25 bb.fatal("Unknown CMake Generator %s" % generator) 22 bb.fatal("Unknown CMake Generator %s" % generator)
23
24 # C/C++ Compiler (without cpu arch/tune arguments)
25 if not d.getVar('OECMAKE_C_COMPILER'):
26 cc_list = d.getVar('CC').split()
27 if cc_list[0] == 'ccache':
28 d.setVar('OECMAKE_C_COMPILER', '%s %s' % (cc_list[0], cc_list[1]))
29 else:
30 d.setVar('OECMAKE_C_COMPILER', cc_list[0])
31
32 if not d.getVar('OECMAKE_CXX_COMPILER'):
33 cxx_list = d.getVar('CXX').split()
34 if cxx_list[0] == 'ccache':
35 d.setVar('OECMAKE_CXX_COMPILER', '%s %s' % (cxx_list[0], cxx_list[1]))
36 else:
37 d.setVar('OECMAKE_CXX_COMPILER', cxx_list[0])
26} 38}
27# C/C++ Compiler (without cpu arch/tune arguments)
28OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`"
29OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"
30OECMAKE_AR ?= "${AR}" 39OECMAKE_AR ?= "${AR}"
31 40
32# Compiler flags 41# Compiler flags
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 622e0462b3..59d134801a 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -52,3 +52,6 @@ RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \
52 " 52 "
53 53
54INSANE_SKIP_${PN} += "dev-so already-stripped" 54INSANE_SKIP_${PN} += "dev-so already-stripped"
55
56# Can't be built with ccache
57CCACHE_DISABLE = "1"
diff --git a/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb b/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb
index dd3adeeb0d..02e4330cf2 100644
--- a/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb
@@ -35,3 +35,6 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU
35 35
36RRECOMMENDS_${PN} = "mesa-vulkan-drivers" 36RRECOMMENDS_${PN} = "mesa-vulkan-drivers"
37INSANE_SKIP_${PN}-dev += "dev-elf" 37INSANE_SKIP_${PN}-dev += "dev-elf"
38
39# Can't be built with ccache
40CCACHE_DISABLE = "1"
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb
index fc56822f7a..2e79f739ea 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.22.5.bb
@@ -121,3 +121,6 @@ ARM_INSTRUCTION_SET_armv7ve = "thumb"
121# Segmentation fault 121# Segmentation fault
122GI_DATA_ENABLED_armv7a = "False" 122GI_DATA_ENABLED_armv7a = "False"
123GI_DATA_ENABLED_armv7ve = "False" 123GI_DATA_ENABLED_armv7ve = "False"
124
125# Can't be built with ccache
126CCACHE_DISABLE = "1"