summaryrefslogtreecommitdiffstats
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>2017-05-28 01:02:19 +0100
commit3ac7c847e802a67c5c2d49d0becad6ede8354ee7 (patch)
tree4a3e38d65cd510c846b6380968f4c92f50bf6cae
parent80b35ed1a282a4f3f5d723febfd70481a48182c2 (diff)
downloadpoky-3ac7c847e802a67c5c2d49d0becad6ede8354ee7.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) RP: backported from 2.12 to 2.10 (From OE-Core rev: cf06e8aa07c8b60a377b4716be5c72311be12f1c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch45
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.10.7.bb1
2 files changed, 46 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..cc718140a6
--- /dev/null
+++ b/meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch
@@ -0,0 +1,45 @@
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
12Index: webkitgtk-2.10.7/Source/WebKit2/PlatformGTK.cmake
13===================================================================
14--- webkitgtk-2.10.7.orig/Source/WebKit2/PlatformGTK.cmake
15+++ webkitgtk-2.10.7/Source/WebKit2/PlatformGTK.cmake
16@@ -880,8 +880,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@@ -929,7 +930,7 @@ endif ()
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 LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
37@@ -982,7 +983,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
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
index edf9a5b3b9..55d148f071 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
@@ -18,6 +18,7 @@ SRC_URI = "\
18 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ 18 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
19 file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ 19 file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \
20 file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ 20 file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
21 file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
21 " 22 "
22SRC_URI[md5sum] = "84832b9d8329413b4f1d87df5f7e8efe" 23SRC_URI[md5sum] = "84832b9d8329413b4f1d87df5f7e8efe"
23SRC_URI[sha256sum] = "990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e" 24SRC_URI[sha256sum] = "990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e"