summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-12-16 11:02:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-09 13:39:13 +0000
commit09d4274a9d15ae17349f8338de56c7442e3bfcee (patch)
treea64c46ef5f81aa3902516aa61fb523b746321442 /meta/recipes-sato/webkit
parent904d06ffc90259a8f9f33014a5ec381c94aa0755 (diff)
downloadpoky-09d4274a9d15ae17349f8338de56c7442e3bfcee.tar.gz
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>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/x32_support.patch22
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.14.2.bb7
2 files changed, 29 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/x32_support.patch b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
new file mode 100644
index 0000000000..fea4c27147
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/x32_support.patch
@@ -0,0 +1,22 @@
1From: Daniel Schepler <dschepler@gmail.com>
2Subject: Fix FTBFS in x32
3Bug-Debian: https://bugs.debian.org/700795
4Upstream-Status: Pending
5Signed-off-by: Christopher Larson <chris_larson@mentor.com>
6Index: webkitgtk/Source/WTF/wtf/Platform.h
7===================================================================
8--- webkitgtk.orig/Source/WTF/wtf/Platform.h
9+++ webkitgtk/Source/WTF/wtf/Platform.h
10@@ -182,8 +182,12 @@
11 /* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
12 #if defined(__x86_64__) \
13 || defined(_M_X64)
14+#ifdef __ILP32__
15+#define WTF_CPU_X86_64_32 1
16+#else
17 #define WTF_CPU_X86_64 1
18 #endif
19+#endif
20
21 /* CPU(ARM64) - Apple */
22 #if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb
index 46b54683fb..9720432302 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb
@@ -20,6 +20,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
20 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ 20 file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 21 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
22 file://detect_atomics.patch \ 22 file://detect_atomics.patch \
23 file://x32_support.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "2fe3cadbc546d93ca68a13756c2be015" 26SRC_URI[md5sum] = "2fe3cadbc546d93ca68a13756c2be015"
@@ -85,6 +86,12 @@ EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
85# JIT not supported on MIPS either 86# JIT not supported on MIPS either
86EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF " 87EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF "
87 88
89# JIT not supported on X32
90# An attempt was made to upstream JIT support for x32 in
91# https://bugs.webkit.org/show_bug.cgi?id=100450, but this was closed as
92# unresolved due to limited X32 adoption.
93EXTRA_OECMAKE_append_linux-gnux32 = " -DENABLE_JIT=OFF"
94
88SECURITY_CFLAGS_remove_aarch64 = "-fpie" 95SECURITY_CFLAGS_remove_aarch64 = "-fpie"
89SECURITY_CFLAGS_append_aarch64 = " -fPIE" 96SECURITY_CFLAGS_append_aarch64 = " -fPIE"
90 97