diff options
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 | 49 |
1 files changed, 49 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..896890b433 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From b7f40eceef0f23bf88090789d4c5845c35f048ae 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 4/9] 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 | --- | ||
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 a33c6a86..d83a2e77 100644 | ||
15 | --- a/Source/WebKit/PlatformGTK.cmake | ||
16 | +++ b/Source/WebKit/PlatformGTK.cmake | ||
17 | @@ -1122,8 +1122,9 @@ endif () | ||
18 | string(REGEX MATCHALL "-L[^ ]*" | ||
19 | INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") | ||
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 WebKit2 | ||
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 | @@ -1168,7 +1169,7 @@ add_custom_command( | ||
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 | @@ -1225,7 +1226,7 @@ add_custom_command( | ||
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 | |||
47 | -- | ||
48 | 2.14.1 | ||
49 | |||