diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-08-29 17:30:22 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-03 09:58:45 +0100 |
| commit | 2154c1c803b7bd36a1401fa657e7fd8cb1060a70 (patch) | |
| tree | dd2b4f8d74291034fc17c17e02bdebb58875624c /meta/recipes-sato/webkit | |
| parent | 94493f1a6e8d1fbd1fa78053f5ead3d0e363d184 (diff) | |
| download | openembedded-core-2154c1c803b7bd36a1401fa657e7fd8cb1060a70.tar.gz openembedded-core-2154c1c803b7bd36a1401fa657e7fd8cb1060a70.tar.bz2 openembedded-core-2154c1c803b7bd36a1401fa657e7fd8cb1060a70.zip | |
webkitgtk: fix racy double build of WebKit2-4.0.gir
This occasionally triggered autobuilder errors where the .gir file
appeared truncated to introspection tools.
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.patch | 48 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.12.4.bb | 1 |
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 @@ +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(-) + +diff --git a/Source/WebKit2/PlatformGTK.cmake b/Source/WebKit2/PlatformGTK.cmake +index adaa010..f18cf8a 100644 +--- a/Source/WebKit2/PlatformGTK.cmake ++++ b/Source/WebKit2/PlatformGTK.cmake +@@ -906,8 +906,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= +@@ -950,7 +951,7 @@ add_custom_command( + 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}" + ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}" +@@ -1004,7 +1005,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 + ) + +-- +2.9.3 + 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 = "\ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ file://musl-fixes.patch \ file://ppc-musl-fix.patch \ + file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ " SRC_URI[md5sum] = "0331ac714fd1a0587ffea470ef1afb20" SRC_URI[sha256sum] = "424d3177599abbc1eb1a1ad7928dd280a62006e992f2fada2e059375a9609a77" |