summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiaying Song <jiaying.song.cn@windriver.com>2025-09-04 17:11:06 +0800
committerKhem Raj <raj.khem@gmail.com>2025-09-04 10:50:39 -0700
commit2257a50dbd8b3ab375ad1e76526b04ff467c41b0 (patch)
treee740882e0ed0e409a5d75e02b107d2c56852aa30
parent44c9118e9dfa7fbca2df5593598e07c1da1d564c (diff)
downloadmeta-openembedded-2257a50dbd8b3ab375ad1e76526b04ff467c41b0.tar.gz
webkitgtk3: fix do_configure error on beaglebone-yocto
* According to latest comment [1] and the mentioned pull request [2], build an ENABLE(WEBASSEMBLY) && !ENABLE(JIT) configuration is supported, so original issue already fixed in current version, the EXTRA_OECMAKE setting is not needed anymore. * This EXTRA_OECMAKE setting causes following configure error on beaglebone-yocto, remove the setting to let the configure process decide the configuration: CMake Error at Source/cmake/WebKitFeatures.cmake:312 (message): ENABLE_JIT conflicts with ENABLE_C_LOOP. You must disable one or the other. [YOCTO #15254] [1] https://github.com/WebKit/WebKit/pull/17447 [2] https://github.com/WebKit/WebKit/pull/17688 Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.3.bb12
1 files changed, 0 insertions, 12 deletions
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.3.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.3.bb
index 23cacc021b..aa82831b81 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.3.bb
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.3.bb
@@ -123,18 +123,6 @@ EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF "
123EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " 123EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF "
124EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " 124EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF "
125 125
126# And for armv7* don't enable it for softfp, because after:
127# https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918
128# https://bugs.webkit.org/show_bug.cgi?id=242172
129# softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets
130# explicitly disabled causing:
131# http://errors.yoctoproject.org/Errors/Details/734587/
132# PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled
133# https://github.com/WebKit/WebKit/pull/17447
134EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
135EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
136EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
137
138# JIT does not work on RISCV 126# JIT does not work on RISCV
139EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF" 127EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF"
140 128