diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-14 09:02:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-14 20:46:39 +0100 |
commit | 39b661eb0baab17f733df854b05047aedf3f726b (patch) | |
tree | 5f080b5bdccb46782cfdc681dde0ab575fa1de9b /meta/recipes-sato | |
parent | 572e50d73a1ddf97ec5e81fb114bbb5c730cae2e (diff) | |
download | poky-39b661eb0baab17f733df854b05047aedf3f726b.tar.gz |
webkitgtk: Add patch to fix gcc5 compile issues
Without this patch, webkitgtk fails to build with gcc5. I found Khem had
sent the patch against Qt for the same issue we were seeing on mips/ppc.
(From OE-Core rev: a4f5e826689a6ab85e9d7424aa32602760d386bf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/gcc5.patch | 26 | ||||
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.8.5.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc5.patch b/meta/recipes-sato/webkit/webkitgtk/gcc5.patch new file mode 100644 index 0000000000..5951a81f34 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/gcc5.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | JSObject: Create explicit instantiation of putByIndexBeyondVectorLengthWithoutAttributes | ||
2 | |||
3 | Reason for change: newer gcc might optimize away the templates | ||
4 | and they wont be available for other .cpp files to use as these | ||
5 | are used in a different .cpp we need to tell compiler to explicitly | ||
6 | instantiate them. | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Index: webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp | ||
13 | =================================================================== | ||
14 | --- webkitgtk-2.8.5.orig/Source/JavaScriptCore/runtime/JSObject.cpp | ||
15 | +++ webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp | ||
16 | @@ -1965,6 +1965,10 @@ void JSObject::putByIndexBeyondVectorLen | ||
17 | } | ||
18 | } | ||
19 | |||
20 | +template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); | ||
21 | +template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); | ||
22 | +template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); | ||
23 | + | ||
24 | void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) | ||
25 | { | ||
26 | VM& vm = exec->vm(); | ||
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb index 365f20bbb8..82d670d944 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.8.5.bb | |||
@@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://Source/JavaScriptCore/COPYING.LIB;md5=d0c6d6397a5d842 | |||
13 | SRC_URI = "\ | 13 | SRC_URI = "\ |
14 | http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ | 14 | http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ |
15 | file://0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch \ | 15 | file://0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch \ |
16 | file://gcc5.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae" | 18 | SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae" |
18 | SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20" | 19 | SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20" |