diff options
| author | Jiaying Song <jiaying.song.cn@windriver.com> | 2025-09-05 16:15:38 +0800 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2025-10-30 15:07:38 +0800 |
| commit | 59594572f9a350bc0e4aeed35bb513b94d5447f0 (patch) | |
| tree | 61d0e9679f39e84d452f13ce442d9f0a70bf65f1 /meta-oe | |
| parent | aebbd0f9655736f38d301c4bee982baf5a4bb7b5 (diff) | |
| download | meta-openembedded-59594572f9a350bc0e4aeed35bb513b94d5447f0.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: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb index 7d70cbda78..440cae62dd 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb | |||
| @@ -115,18 +115,6 @@ EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " | |||
| 115 | EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " | 115 | EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " |
| 116 | EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " | 116 | EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " |
| 117 | 117 | ||
| 118 | # And for armv7* don't enable it for softfp, because after: | ||
| 119 | # https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918 | ||
| 120 | # https://bugs.webkit.org/show_bug.cgi?id=242172 | ||
| 121 | # softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets | ||
| 122 | # explicitly disabled causing: | ||
| 123 | # http://errors.yoctoproject.org/Errors/Details/734587/ | ||
| 124 | # PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled | ||
| 125 | # https://github.com/WebKit/WebKit/pull/17447 | ||
| 126 | EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
| 127 | EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
| 128 | EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
| 129 | |||
| 130 | EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " | 118 | EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " |
| 131 | EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " | 119 | EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " |
| 132 | 120 | ||
