It does not build Signed-off-by: Khem Raj <raj.k...@gmail.com> --- .../webkit/files/disable_wasm_riscv64.patch | 24 +++++++++++++++++++ .../recipes-sato/webkit/webkitgtk-3_2.40.0.bb | 7 +++--- meta/recipes-sato/webkit/webkitgtk_2.40.0.bb | 7 +++--- 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-sato/webkit/files/disable_wasm_riscv64.patch
diff --git a/meta/recipes-sato/webkit/files/disable_wasm_riscv64.patch b/meta/recipes-sato/webkit/files/disable_wasm_riscv64.patch new file mode 100644 index 0000000000..eac942fddc --- /dev/null +++ b/meta/recipes-sato/webkit/files/disable_wasm_riscv64.patch @@ -0,0 +1,24 @@ +Provide a way to override enabling wasm from CMake +by setting -DENABLE_WEBASSEMBLY=OFF for RISCV64 + +Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=254553] +Signed-off-by: Khem Raj <raj.k...@gmail.com> + +--- a/Source/WTF/wtf/PlatformEnable.h ++++ b/Source/WTF/wtf/PlatformEnable.h +@@ -613,13 +613,14 @@ + #endif + + #if CPU(RISCV64) +-#undef ENABLE_WEBASSEMBLY ++#if !defined(ENABLE_WEBASSEMBLY) + #define ENABLE_WEBASSEMBLY 1 + #undef ENABLE_WEBASSEMBLY_B3JIT + #define ENABLE_WEBASSEMBLY_B3JIT 0 + #undef ENABLE_WEBASSEMBLY_BBQJIT + #define ENABLE_WEBASSEMBLY_BBQJIT 0 + #endif ++#endif + + #if !defined(ENABLE_C_LOOP) + #if ENABLE(JIT) || CPU(X86_64) || CPU(ARM64) diff --git a/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb b/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb index 4401b0e527..8932bcb562 100644 --- a/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://reproducibility.patch \ + file://disable_wasm_riscv64.patch \ " SRC_URI[sha256sum] = "a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393" @@ -113,9 +114,9 @@ EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " -# JIT and gold linker does not work on RISCV -EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" -EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +# JIT and WASM does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF -DENABLE_WEBASSEMBLY=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DENABLE_JIT=OFF -DENABLE_WEBASSEMBLY=OFF" # JIT not supported on MIPS either EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " diff --git a/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb index 84a5981ba0..04f722a913 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://reproducibility.patch \ + file://disable_wasm_riscv64.patch \ " SRC_URI[sha256sum] = "a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393" @@ -112,9 +113,9 @@ EXTRA_OECMAKE:append:armv4 = " -DENABLE_JIT=OFF " EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " -# JIT and gold linker does not work on RISCV -EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" -EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF" +# JIT and WASM does not work on RISCV +EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF -DENABLE_WEBASSEMBLY=OFF" +EXTRA_OECMAKE:append:riscv64 = " -DENABLE_JIT=OFF -DENABLE_WEBASSEMBLY=OFF" # JIT not supported on MIPS either EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " -- 2.40.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#179189): https://lists.openembedded.org/g/openembedded-core/message/179189 Mute This Topic: https://lists.openembedded.org/mt/97894684/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
