Title: [290279] trunk/Source/WebKit
- Revision
- 290279
- Author
- [email protected]
- Date
- 2022-02-21 17:42:45 -0800 (Mon, 21 Feb 2022)
Log Message
Fix racy parallel build of WebKit2-4.0.gir
https://bugs.webkit.org/show_bug.cgi?id=232935
Patch by Alexander Kanavin <[email protected]> on 2022-02-21
Reviewed by Michael Catanzaro.
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
(e.g. command would run twice, target runs only once).
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (290278 => 290279)
--- trunk/Source/WebKit/ChangeLog 2022-02-22 01:37:17 UTC (rev 290278)
+++ trunk/Source/WebKit/ChangeLog 2022-02-22 01:42:45 UTC (rev 290279)
@@ -1,3 +1,16 @@
+2022-02-21 Alexander Kanavin <[email protected]>
+
+ Fix racy parallel build of WebKit2-4.0.gir
+ https://bugs.webkit.org/show_bug.cgi?id=232935
+
+ Reviewed by Michael Catanzaro.
+
+ 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
+ (e.g. command would run twice, target runs only once).
+
+ * PlatformGTK.cmake:
+
2022-02-21 Myles C. Maxfield <[email protected]>
Sort WebCore and WebKit Xcode project files
Modified: trunk/Source/WebKit/PlatformGTK.cmake (290278 => 290279)
--- trunk/Source/WebKit/PlatformGTK.cmake 2022-02-22 01:37:17 UTC (rev 290278)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2022-02-22 01:42:45 UTC (rev 290279)
@@ -670,8 +670,9 @@
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}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
@@ -719,7 +720,7 @@
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${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
LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
@@ -781,7 +782,7 @@
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
)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
