diff options
| author |   Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-08-29 17:30:22 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-27 22:27:46 +0100 |
| commit | cf06e8aa07c8b60a377b4716be5c72311be12f1c (patch) | |
| tree | 06782c14f22f3f9a0c2fb7863e755b1c35387c6b /meta | |
| parent | 0314442ec4cb280fd8ad2f9deb9b3ec8842f8c2a (diff) | |
| download | openembedded-core-cf06e8aa07c8b60a377b4716be5c72311be12f1c.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
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-sato/webkit/files/0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch | 45 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.10.7.bb | 1 |
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 @@ +From 5760d346b42807b596f479c81f7a6b42eb36065e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 29 Aug 2016 16:38:11 +0300 +Subject: [PATCH] Fix racy parallel build of WebKit2-4.0.gir + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Source/WebKit2/PlatformGTK.cmake | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +Index: webkitgtk-2.10.7/Source/WebKit2/PlatformGTK.cmake +=================================================================== +--- webkitgtk-2.10.7.orig/Source/WebKit2/PlatformGTK.cmake ++++ webkitgtk-2.10.7/Source/WebKit2/PlatformGTK.cmake +@@ -880,8 +880,9 @@ endif () + string(REGEX MATCHALL "-L[^ ]*" + INTROSPECTION_ADDITIONAL_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + +-add_custom_command( +- OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++# This is a target and not a command because it's used to build another .gir ++# and a .typelib, which would trigger two racy parallel builds when using command ++add_custom_target(WebKit2-${WEBKITGTK_API_VERSION}-gir + DEPENDS WebKit2 + DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS= +@@ -929,7 +930,7 @@ endif () + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir + DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir +- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir + COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} + LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}" + LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" +@@ -982,7 +983,7 @@ add_custom_command( + + add_custom_command( + OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib +- DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir ++ DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir + COMMAND ${INTROSPECTION_COMPILER} --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir -o ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib + ) + 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 = "\ file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \ + file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ " SRC_URI[md5sum] = "84832b9d8329413b4f1d87df5f7e8efe" SRC_URI[sha256sum] = "990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e" |