webkitgtk: patch & disable JIT for x32
It might not be speedy, but it does build now. (From OE-Core rev: 79f7e215ee7c176f02efafe7359aaa77dbd9430c) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
904d06ffc9
commit
09d4274a9d
|
@ -0,0 +1,22 @@
|
||||||
|
From: Daniel Schepler <dschepler@gmail.com>
|
||||||
|
Subject: Fix FTBFS in x32
|
||||||
|
Bug-Debian: https://bugs.debian.org/700795
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
|
||||||
|
Index: webkitgtk/Source/WTF/wtf/Platform.h
|
||||||
|
===================================================================
|
||||||
|
--- webkitgtk.orig/Source/WTF/wtf/Platform.h
|
||||||
|
+++ webkitgtk/Source/WTF/wtf/Platform.h
|
||||||
|
@@ -182,8 +182,12 @@
|
||||||
|
/* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
|
||||||
|
#if defined(__x86_64__) \
|
||||||
|
|| defined(_M_X64)
|
||||||
|
+#ifdef __ILP32__
|
||||||
|
+#define WTF_CPU_X86_64_32 1
|
||||||
|
+#else
|
||||||
|
#define WTF_CPU_X86_64 1
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* CPU(ARM64) - Apple */
|
||||||
|
#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
|
|
@ -20,6 +20,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
|
||||||
file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
|
file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
|
||||||
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
|
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
|
||||||
file://detect_atomics.patch \
|
file://detect_atomics.patch \
|
||||||
|
file://x32_support.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "2fe3cadbc546d93ca68a13756c2be015"
|
SRC_URI[md5sum] = "2fe3cadbc546d93ca68a13756c2be015"
|
||||||
|
@ -85,6 +86,12 @@ EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
|
||||||
# JIT not supported on MIPS either
|
# JIT not supported on MIPS either
|
||||||
EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF "
|
EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF "
|
||||||
|
|
||||||
|
# JIT not supported on X32
|
||||||
|
# An attempt was made to upstream JIT support for x32 in
|
||||||
|
# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as
|
||||||
|
# unresolved due to limited X32 adoption.
|
||||||
|
EXTRA_OECMAKE_append_linux-gnux32 = " -DENABLE_JIT=OFF"
|
||||||
|
|
||||||
SECURITY_CFLAGS_remove_aarch64 = "-fpie"
|
SECURITY_CFLAGS_remove_aarch64 = "-fpie"
|
||||||
SECURITY_CFLAGS_append_aarch64 = " -fPIE"
|
SECURITY_CFLAGS_append_aarch64 = " -fPIE"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue