diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-04-07 19:00:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-13 22:23:49 +0100 |
commit | dc849aa9ebab3117f60d5f1728cdb9a325528e8a (patch) | |
tree | 4d49e4592d9c0ddfd65aa73da55b80265bae4835 /meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | |
parent | 50f5ca8ccf37dbb889a821b21120a35ef893d804 (diff) | |
download | poky-dc849aa9ebab3117f60d5f1728cdb9a325528e8a.tar.gz |
webkitgtk: update 2.34.6 -> 2.36.0
Drop patches:
0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch
(both merged upstream)
reduce-memory-overheads.patch
(rejected by upstream, there's no use case - see the discussion)
Rebase to version submitted upstream:
0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
Add:
0001-When-building-introspection-files-do-not-quote-CFLAG.patch
angle is no longer needed for x11-less setups.
(From OE-Core rev: 05582e9e6583126879977b0bbb88b691d625056b)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
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 | 46 |
1 files changed, 0 insertions, 46 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 deleted file mode 100644 index e06607ba2b..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | From 4718888071e29deb8b245b88c81577fd5bac4e5e 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: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232935] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | Source/WebKit/PlatformGTK.cmake | 9 +++++---- | ||
11 | 1 file changed, 5 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake | ||
14 | index a069c5f6..ea2f542b 100644 | ||
15 | --- a/Source/WebKit/PlatformGTK.cmake | ||
16 | +++ b/Source/WebKit/PlatformGTK.cmake | ||
17 | @@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION) | ||
18 | set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}") | ||
19 | endif () | ||
20 | |||
21 | - add_custom_command( | ||
22 | - OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
23 | + # This is a target and not a command because it's used to build another .gir | ||
24 | + # and a .typelib, which would trigger two racy parallel builds when using command | ||
25 | + add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
26 | DEPENDS WebKit | ||
27 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
28 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= | ||
29 | @@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION) | ||
30 | add_custom_command( | ||
31 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir | ||
32 | DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir | ||
33 | - DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
34 | + DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
35 | COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} | ||
36 | LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" | ||
37 | ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" | ||
38 | @@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION) | ||
39 | |||
40 | add_custom_command( | ||
41 | OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | ||
42 | - DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir | ||
43 | + DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir | ||
44 | COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib | ||
45 | ) | ||
46 | |||