summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2024-12-18 20:24:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-20 15:47:14 +0000
commit50db08cdd6ef47ef94ca0ba35de2dbfca4a8ad19 (patch)
treee14e5208b50b858eb1380ed0d3d7131e387efa27
parent8a051bd0ea67e16c6eaac82036c62bfc933f6978 (diff)
downloadpoky-50db08cdd6ef47ef94ca0ba35de2dbfca4a8ad19.tar.gz
webkitgtk: Fix build on 32bit arches with 64bit time_t only
This is a fix needed in angle module which is vendored in webkit repo. glibc does not define SYS_futex on 32bit arches with 64bit time_t only e.g. riscv32 (From OE-Core rev: fab8dbdc48b6ae59bb1ea4cb47204f99f195b12c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/sys_futex.patch16
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.46.4.bb1
2 files changed, 17 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch b/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch
new file mode 100644
index 0000000000..19d18dea88
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch
@@ -0,0 +1,16 @@
1Fix build on newer 32bit architectures with only 64bit time_t
2
3Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/angle/angle/+/6108397]
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5--- a/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
6+++ b/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
7@@ -17,6 +17,9 @@
8 # include <linux/futex.h>
9 # include <sys/syscall.h>
10 # include <unistd.h>
11+# if !defined(SYS_futex) && defined(SYS_futex_time64)
12+# define SYS_futex SYS_futex_time64
13+# endif
14 # endif // defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_ANDROID)
15
16 # if defined(ANGLE_PLATFORM_WINDOWS)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.46.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.46.4.bb
index f7d0b5e050..6e1b793924 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.46.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.46.4.bb
@@ -17,6 +17,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
17 file://t6-not-declared.patch \ 17 file://t6-not-declared.patch \
18 file://0001-Support-ICU-76.1-build.patch \ 18 file://0001-Support-ICU-76.1-build.patch \
19 file://bmalloc-fix.patch \ 19 file://bmalloc-fix.patch \
20 file://sys_futex.patch \
20 " 21 "
21SRC_URI[sha256sum] = "0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176" 22SRC_URI[sha256sum] = "0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176"
22 23