mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
390d95991d
commit
71ffc92036
@@ -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
|
||||||
|
|
||||||
@@ -18,6 +18,7 @@ SRC_URI = "\
|
|||||||
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
|
file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \
|
||||||
file://musl-fixes.patch \
|
file://musl-fixes.patch \
|
||||||
file://ppc-musl-fix.patch \
|
file://ppc-musl-fix.patch \
|
||||||
|
file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "0331ac714fd1a0587ffea470ef1afb20"
|
SRC_URI[md5sum] = "0331ac714fd1a0587ffea470ef1afb20"
|
||||||
SRC_URI[sha256sum] = "424d3177599abbc1eb1a1ad7928dd280a62006e992f2fada2e059375a9609a77"
|
SRC_URI[sha256sum] = "424d3177599abbc1eb1a1ad7928dd280a62006e992f2fada2e059375a9609a77"
|
||||||
|
|||||||
Reference in New Issue
Block a user