diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-04-21 08:09:12 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-12 08:49:29 +0100 |
| commit | bfbdd1a2069f199be9ba0909dd512469ff17b65e (patch) | |
| tree | f06897fc6a99838ad53301e6a25d205532466e0d /meta/recipes-sato/webkit/webkitgtk/gcc7.patch | |
| parent | 9ba71dc40dd782d192504b0827ca91f0fe180abe (diff) | |
| download | openembedded-core-contrib-bfbdd1a2069f199be9ba0909dd512469ff17b65e.tar.gz | |
webkitgtk: Upgrade to 2.16.1
Fix build with gcc7
Move all patches to webkit folder
Drop patches that were backports or have been upstreamed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk/gcc7.patch')
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/gcc7.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/gcc7.patch b/meta/recipes-sato/webkit/webkitgtk/gcc7.patch new file mode 100644 index 0000000000..aee29a9a72 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/gcc7.patch @@ -0,0 +1,23 @@ +Imported from +https://src.fedoraproject.org/cgit/rpms/webkitgtk4.git/plain/gcc7.patch + +Add to CXX flags since webkitgtk uses c++ compiler by default +Fixes +Source/JavaScriptCore/runtime/JSGenericTypedArrayView.h:119:67: error: no matching function for call to 'JSC::JSGenericTypedArrayView<Adaptor>::vector() const' +| return bitwise_cast<const typename Adaptor::Type*>(vector()); + +Signed-off-by: Khem Raj <raj.khem@gmail.com +Upstream-Status: Pending + +diff -up webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake +--- webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake.gcc7 2017-02-21 09:57:13.168916004 +0100 ++++ webkitgtk-2.15.90/Source/cmake/OptionsCommon.cmake 2017-02-21 09:58:12.811563156 +0100 +@@ -41,6 +41,8 @@ if (COMPILER_IS_GCC_OR_CLANG) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined") + endif () + + if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja") |