| 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 |
| |