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 10:44:10 +0100 |
| commit | a4f5e826689a6ab85e9d7424aa32602760d386bf (patch) | |
| tree | 0c675be9b8c3f33497ee1105182713b6a792b444 /meta | |
| parent | a7f06b7821f788f77ae5e0f2822480f85e338ad1 (diff) | |
| download | openembedded-core-a4f5e826689a6ab85e9d7424aa32602760d386bf.tar.gz openembedded-core-a4f5e826689a6ab85e9d7424aa32602760d386bf.tar.bz2 openembedded-core-a4f5e826689a6ab85e9d7424aa32602760d386bf.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -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 @@ +JSObject: Create explicit instantiation of putByIndexBeyondVectorLengthWithoutAttributes + +Reason for change: newer gcc might optimize away the templates +and they wont be available for other .cpp files to use as these +are used in a different .cpp we need to tell compiler to explicitly +instantiate them. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Pending + +Index: webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp +=================================================================== +--- webkitgtk-2.8.5.orig/Source/JavaScriptCore/runtime/JSObject.cpp ++++ webkitgtk-2.8.5/Source/JavaScriptCore/runtime/JSObject.cpp +@@ -1965,6 +1965,10 @@ void JSObject::putByIndexBeyondVectorLen + } + } + ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<Int32Shape>(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<DoubleShape>(ExecState* exec, unsigned i, JSValue value); ++template void JSObject::putByIndexBeyondVectorLengthWithoutAttributes<ContiguousShape>(ExecState* exec, unsigned i, JSValue value); ++ + void JSObject::putByIndexBeyondVectorLengthWithArrayStorage(ExecState* exec, unsigned i, JSValue value, bool shouldThrow, ArrayStorage* storage) + { + 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 SRC_URI = "\ http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-This-patch-fixes-a-command-line-that-is-too-long-ove.patch \ + file://gcc5.patch \ " SRC_URI[md5sum] = "df79991848a5096d3a75289ebce547ae" SRC_URI[sha256sum] = "3d1f0c534935f43fd74df90f2648fcee672d60f1f57a30fa557a77891ae04d20" |