diff mbox series

[master] webkitgtk: fix do_configure error on beaglebone-yocto

Message ID 20240826085148.3492132-1-changqing.li@windriver.com
State Accepted, archived
Commit 26a34fd71659e32e56ccc4f23e79aa62f4bc062d
Headers show
Series [master] webkitgtk: fix do_configure error on beaglebone-yocto | expand

Commit Message

Changqing Li Aug. 26, 2024, 8:51 a.m. UTC
From: Changqing Li <changqing.li@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: Changqing Li <changqing.li@windriver.com>
---
 meta/recipes-sato/webkit/webkitgtk_2.44.3.bb | 12 ------------
 1 file changed, 12 deletions(-)

Comments

Richard Purdie Aug. 26, 2024, 10:57 a.m. UTC | #1
On Mon, 2024-08-26 at 16:51 +0800, Changqing Li via
lists.openembedded.org wrote:
> From: Changqing Li <changqing.li@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: Changqing Li <changqing.li@windriver.com>
> ---
>  meta/recipes-sato/webkit/webkitgtk_2.44.3.bb | 12 ------------
>  1 file changed, 12 deletions(-)

Why aren't we seeing that error on the autobuilder?

Cheers,

Richard
Alexander Kanavin Aug. 26, 2024, 11:04 a.m. UTC | #2
On Mon, 26 Aug 2024 at 12:57, Richard Purdie via
lists.openembedded.org
<richard.purdie=linuxfoundation.org@lists.openembedded.org> wrote:
> >  meta/recipes-sato/webkit/webkitgtk_2.44.3.bb | 12 ------------
> >  1 file changed, 12 deletions(-)
>
> Why aren't we seeing that error on the autobuilder?

I guess webkit isn't a part of the standard arch-qemu targets (e.g.
sato images)?

Alex
Changqing Li Aug. 27, 2024, 2:25 a.m. UTC | #3
On 8/26/24 19:04, Alexander Kanavin wrote:
> CAUTION: This email comes from a non Wind River email account!
> Do not click links or open attachments unless you recognize the sender and know the content is safe.
>
> On Mon, 26 Aug 2024 at 12:57, Richard Purdie via
> lists.openembedded.org
> <richard.purdie=linuxfoundation.org@lists.openembedded.org>  wrote:
>>>   meta/recipes-sato/webkit/webkitgtk_2.44.3.bb | 12 ------------
>>>   1 file changed, 12 deletions(-)
>> Why aren't we seeing that error on the autobuilder?
> I guess webkit isn't a part of the standard arch-qemu targets (e.g.
> sato images)?
>
> Alex

Yes,  this issue only reproduced on beaglebone-yocto.  And webkit is not 
the included in core-image-sato,

and we seems don't have world build for beaglebone-yocto on the autobuilder.

//Changqing
diff mbox series

Patch

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb b/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
index a79a9c3824..90fb7a1d42 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.44.3.bb
@@ -114,18 +114,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 "