50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
From b7f40eceef0f23bf88090789d4c5845c35f048ae 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 4/9] 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 a33c6a86..d83a2e77 100644
|
|
--- a/Source/WebKit/PlatformGTK.cmake
|
|
+++ b/Source/WebKit/PlatformGTK.cmake
|
|
@@ -1122,8 +1122,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=
|
|
@@ -1168,7 +1169,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}"
|
|
@@ -1225,7 +1226,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.14.1
|
|
|