]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
webkitgtk: Fix build on 32bit arches with 64bit time_t only
authorKhem Raj <raj.khem@gmail.com>
Thu, 19 Dec 2024 04:24:22 +0000 (20:24 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 20 Dec 2024 15:46:55 +0000 (15:46 +0000)
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>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
meta/recipes-sato/webkit/webkitgtk/sys_futex.patch [new file with mode: 0644]
meta/recipes-sato/webkit/webkitgtk_2.46.4.bb

diff --git a/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch b/meta/recipes-sato/webkit/webkitgtk/sys_futex.patch
new file mode 100644 (file)
index 0000000..19d18de
--- /dev/null
@@ -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)
index f7d0b5e05051b62a9ac9a55f1b17cc1df8d3f556..6e1b7939241f31e84e7c6d9cfc129444fb000bef 100644 (file)
@@ -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"