summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/webkit
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-08-29 17:30:22 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 23:45:52 +0100
commit71ffc920362a5cefe3aad04bbb42cb4e8729cb18 (patch)
tree5b8c6a393f0550b61b0a947e2eb43d92cdef5077 /meta/recipes-sato/webkit
parent390d95991d69d0c05ccb46e54b6e0634bf945065 (diff)
downloadpoky-71ffc920362a5cefe3aad04bbb42cb4e8729cb18.tar.gz
webkitgtk: fix racy double build of WebKit2-4.0.gir
This occasionally triggered autobuilder errors where the .gir file appeared truncated to introspection tools. (From OE-Core rev: 2154c1c803b7bd36a1401fa657e7fd8cb1060a70) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit')
-rw-r--r--meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch48
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.12.4.bb1
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch b/meta/recipes-sato/webkit/files/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/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
@@ -0,0 +1,48 @@
1From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 29 Aug 2016 16:38:11 +0300
4Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 Source/WebKit2/PlatformGTK.cmake | 9 +++++----
10 1 file changed, 5 insertions(+), 4 deletions(-)
11
12diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake
13index 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--
472.9.3
48
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb b/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
index cb333368e4..0193e17a31 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.12.4.bb
@@ -18,6 +18,7 @@ SRC_URI = "\
18 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ 18 file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
19 file://musl-fixes.patch \ 19 file://musl-fixes.patch \
20 file://ppc-musl-fix.patch \ 20 file://ppc-musl-fix.patch \
21 file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
21 " 22 "
22SRC_URI[md5sum] = "0331ac714fd1a0587ffea470ef1afb20" 23SRC_URI[md5sum] = "0331ac714fd1a0587ffea470ef1afb20"
23SRC_URI[sha256sum] = "424d3177599abbc1eb1a1ad7928dd280a62006e992f2fada2e059375a9609a77" 24SRC_URI[sha256sum] = "424d3177599abbc1eb1a1ad7928dd280a62006e992f2fada2e059375a9609a77"