diff options
| author | Changqing Li <changqing.li@windriver.com> | 2024-07-12 14:04:32 +0800 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2024-07-17 05:36:14 -0700 |
| commit | f6f743c0c7903fbfecbe921d22411dc9bd178192 (patch) | |
| tree | 0d91bc33ca239e1d271eedbda593cf3df2dc89aa | |
| parent | 260c73ffe9ae6a1b4291d8d7234e35d833f7f5dc (diff) | |
| download | poky-f6f743c0c7903fbfecbe921d22411dc9bd178192.tar.gz | |
webkitgtk: 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
(From OE-Core rev: feeadc65bdae8ad9ba6f5e5fefa7a2466479fe87)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.44.1.bb | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb index 29e12bb8c5..14f7531549 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.44.1.bb | |||
| @@ -114,18 +114,6 @@ EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " | |||
| 114 | EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " | 114 | EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " |
| 115 | EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " | 115 | EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " |
| 116 | 116 | ||
| 117 | # And for armv7* don't enable it for softfp, because after: | ||
| 118 | # https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918 | ||
| 119 | # https://bugs.webkit.org/show_bug.cgi?id=242172 | ||
| 120 | # softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets | ||
| 121 | # explicitly disabled causing: | ||
| 122 | # http://errors.yoctoproject.org/Errors/Details/734587/ | ||
| 123 | # PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled | ||
| 124 | # https://github.com/WebKit/WebKit/pull/17447 | ||
| 125 | EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
| 126 | EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
| 127 | EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" | ||
| 128 | |||
| 129 | EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " | 117 | EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " |
| 130 | EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " | 118 | EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " |
| 131 | 119 | ||