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:51:09 +0100 |
commit | 99df0c34705006cbab9de58bf6b796728a295b7a (patch) | |
tree | 36795369ee372b623d083350b3942f5bc0f85d69 /meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | |
parent | 2b070ef738a30f23963fed4bec3470557a5dc2a3 (diff) | |
download | poky-99df0c34705006cbab9de58bf6b796728a295b7a.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
(From OE-Core rev: bfbdd1a2069f199be9ba0909dd512469ff17b65e)
Signed-off-by: Khem Raj <raj.khem@gmail.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/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch new file mode 100644 index 0000000000..615fe4f402 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 29 Aug 2016 16:38:11 +0300 | ||
4 | Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | Source/WebKit2/PlatformGTK.cmake | 9 +++++---- | ||
10 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
11 | |||
12 | diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake | ||
13 | index adaa010..f18cf8a 100644 | ||
14 | --- a/Source/WebKit2/PlatformGTK.cmake | ||
15 | +++ b/Source/WebKit2/PlatformGTK.cmake | ||
16 | @@ -906,8 +906,9 @@ endif () | ||
17 | string(REGEX MATCHALL "-L[^ ]*" | ||
18 | INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") | ||
19 | |||
20 | -add_custom_command( | ||
21 | - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
22 | +# This is a target and not a command because it's used to build another .gir | ||
23 | +# and a .typelib, which would trigger two racy parallel builds when using command | ||
24 | +add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
25 | DEPENDS WebKit2 | ||
26 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
27 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
28 | @@ -950,7 +951,7 @@ add_custom_command( | ||
29 | add_custom_command( | ||
30 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | ||
31 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
32 | - DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
33 | + DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
34 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | ||
35 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | ||
36 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
37 | @@ -1004,7 +1005,7 @@ add_custom_command( | ||
38 | |||
39 | add_custom_command( | ||
40 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | ||
41 | - DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
42 | + DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
43 | COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | ||
44 | ) | ||
45 | |||
46 | -- | ||
47 | 2.9.3 | ||
48 | |||