| Message ID | 20250905081538.3082838-1-jiaying.song.cn@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-oe,scarthgap,1/2] webkitgtk3: update 2.44.1 -> 2.44.3 | expand |
kindly ping for scarthgap branch -----Original Message----- From: openembedded-devel@lists.openembedded.org <openembedded-devel@lists.openembedded.org> On Behalf Of Song, Jiaying (CN) via lists.openembedded.org Sent: Friday, September 5, 2025 4:16 PM To: openembedded-devel@lists.openembedded.org Subject: [oe] [meta-oe][scarthgap][PATCH 2/2] webkitgtk3: fix do_configure error on beaglebone-yocto From: Jiaying Song <jiaying.song.cn@windriver.com> * 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> --- .../recipes-support/webkitgtk/webkitgtk3_2.44.3.bb | 12 ------------ 1 file changed, 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 " EXTRA_OECMAKE:append:armv5 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:armv6 = " -DENABLE_JIT=OFF " -# And for armv7* don't enable it for softfp, because after: -# https://github.com/WebKit/WebKit/commit/a2ec4ef1997d6fafa6ffc607bffb54e76168a918 -# https://bugs.webkit.org/show_bug.cgi?id=242172 -# softfp armv7* fails because WEBASSEMBLY is left enabled by default and JIT gets -# explicitly disabled causing: -# http://errors.yoctoproject.org/Errors/Details/734587/ -# PR was sent upstream, but the end result is the same both JIT and WEBASSEMBLY disabled -# https://github.com/WebKit/WebKit/pull/17447 -EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" -EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" -EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" - EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " -- 2.34.1
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb similarity index 99% rename from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb rename to meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb index fc96d5dc3b..7d70cbda78 100644 --- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.1.bb +++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb @@ -16,7 +16,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ " -SRC_URI[sha256sum] = "425b1459b0f04d0600c78d1abb5e7edfa3c060a420f8b231e9a6a2d5d29c5561" +SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen