mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-03 02:10:04 +00:00
webkitgtk3: Fix build break due to a typo
Also fix building on riscv64 Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -0,0 +1,39 @@
|
|||||||
|
From: Alberto Garcia <berto@igalia.com>
|
||||||
|
Description: Use WTF_CPU_UNKNOWN when building for riscv64
|
||||||
|
WebKitGTK doesn't build on riscv64 even with the JIT disabled.
|
||||||
|
Treating the CPU as unknown is perhaps a bit severe, but it allows us
|
||||||
|
to get the build done until someone steps up to maintain this
|
||||||
|
properly.
|
||||||
|
Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
|
||||||
|
Forwarded: no
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
--- a/Source/WTF/wtf/PlatformCPU.h
|
||||||
|
+++ b/Source/WTF/wtf/PlatformCPU.h
|
||||||
|
@@ -286,14 +286,6 @@
|
||||||
|
|
||||||
|
#endif /* ARM */
|
||||||
|
|
||||||
|
-/* CPU(RISCV64) - RISC-V 64-bit */
|
||||||
|
-#if defined(__riscv) \
|
||||||
|
- && defined(__riscv_xlen) \
|
||||||
|
- && (__riscv_xlen == 64)
|
||||||
|
-#define WTF_CPU_RISCV64 1
|
||||||
|
-#define WTF_CPU_KNOWN 1
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
#if !CPU(KNOWN)
|
||||||
|
#define WTF_CPU_UNKNOWN 1
|
||||||
|
#endif
|
||||||
|
--- a/Source/cmake/WebKitCommon.cmake
|
||||||
|
+++ b/Source/cmake/WebKitCommon.cmake
|
||||||
|
@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
|
||||||
|
set(WTF_CPU_PPC64 1)
|
||||||
|
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
|
||||||
|
set(WTF_CPU_PPC64LE 1)
|
||||||
|
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
|
||||||
|
- set(WTF_CPU_RISCV64 1)
|
||||||
|
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
|
||||||
|
set(WTF_CPU_LOONGARCH64 1)
|
||||||
|
else ()
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
From: Alberto Garcia <berto@igalia.com>
|
||||||
|
Subject: Fix build failure due to missing semicolon
|
||||||
|
|
||||||
|
Source: https://sources.debian.org/data/main/w/webkit2gtk/2.48.1-2/debian/patches/fix-typo-denormaldisabler.patch
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp
|
||||||
|
+++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp
|
||||||
|
@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
-DenormalDisabler::DenormalDisabler() = default
|
||||||
|
+DenormalDisabler::DenormalDisabler() = default;
|
||||||
|
DenormalDisabler::~DenormalDisabler() = default;
|
||||||
|
#endif
|
||||||
|
|
||||||
@@ -19,6 +19,8 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
|
|||||||
file://no-musttail-arm.patch \
|
file://no-musttail-arm.patch \
|
||||||
file://sys_futex.patch \
|
file://sys_futex.patch \
|
||||||
file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
|
file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
|
||||||
|
file://fix-typo-denormaldisabler.patch \
|
||||||
|
file://fix-ftbfs-riscv64.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[sha256sum] = "98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f"
|
SRC_URI[sha256sum] = "98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user