diff mbox series

webkitgtk: Fix build on 32bit arches with 64bit time_t only

Message ID 20241219042422.25857-1-raj.khem@gmail.com
State Accepted, archived
Commit fab8dbdc48b6ae59bb1ea4cb47204f99f195b12c
Headers show
Series webkitgtk: Fix build on 32bit arches with 64bit time_t only | expand

Commit Message

Khem Raj Dec. 19, 2024, 4:24 a.m. UTC 
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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../webkit/webkitgtk/sys_futex.patch             | 16 ++++++++++++++++
 meta/recipes-sato/webkit/webkitgtk_2.46.4.bb     |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 meta/recipes-sato/webkit/webkitgtk/sys_futex.patch
diff mbox series

Patch

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 00000000000..19d18dea881
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch
@@ -0,0 +1,16 @@ 
+Fix build on newer 32bit architectures with only 64bit time_t
+
+Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/angle/angle/+/6108397]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
++++ b/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
+@@ -17,6 +17,9 @@
+ #        include <linux/futex.h>
+ #        include <sys/syscall.h>
+ #        include <unistd.h>
++#        if !defined(SYS_futex) && defined(SYS_futex_time64)
++#           define SYS_futex SYS_futex_time64
++#        endif
+ #    endif  // defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_ANDROID)
+ 
+ #    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 f7d0b5e0505..6e1b7939241 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 \
            file://t6-not-declared.patch \
            file://0001-Support-ICU-76.1-build.patch \
            file://bmalloc-fix.patch \
+           file://sys_futex.patch \
            "
 SRC_URI[sha256sum] = "0eff5f0ab0a2872ec87df62bc32e3289c8af625716ac71e94b298d74e0374176"