From 4718888071e29deb8b245b88c81577fd5bac4e5e 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/WebKit/PlatformGTK.cmake | 9 +++++----
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
diff --git a/Source/WebKit/PlatformGTK.cmake b/Source/WebKit/PlatformGTK.cmake
|
index a069c5f6..ea2f542b 100644
|
--- a/Source/WebKit/PlatformGTK.cmake
|
+++ b/Source/WebKit/PlatformGTK.cmake
|
@@ -650,8 +650,9 @@ if (ENABLE_INTROSPECTION)
|
set(GIR_SOURCES_TOP_DIRS "--sources-top-dirs=${CMAKE_BINARY_DIR}")
|
endif ()
|
|
- 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 WebKit
|
DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
|
COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations\ ${CMAKE_C_FLAGS} LDFLAGS=
|
@@ -699,7 +700,7 @@ if (ENABLE_INTROSPECTION)
|
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}"
|
@@ -761,7 +762,7 @@ if (ENABLE_INTROSPECTION)
|
|
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
|
)
|
|
