Title: [290431] releases/WebKitGTK/webkit-2.36/Source
- Revision
- 290431
- Author
- [email protected]
- Date
- 2022-02-24 08:08:45 -0800 (Thu, 24 Feb 2022)
Log Message
Merge r290312 - When building introspection files, add CMAKE_C_FLAGS to the compiler flags.
https://bugs.webkit.org/show_bug.cgi?id=232936
Patch by Alexander Kanavin <[email protected]> on 2022-02-22
Reviewed by Michael Catanzaro.
g-ir-compiler is using a C compiler internally, so it needs to set
the proper flags for it.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog (290430 => 290431)
--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog 2022-02-24 15:45:46 UTC (rev 290430)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/ChangeLog 2022-02-24 16:08:45 UTC (rev 290431)
@@ -1,3 +1,15 @@
+2022-02-22 Alexander Kanavin <[email protected]>
+
+ When building introspection files, add CMAKE_C_FLAGS to the compiler flags.
+ https://bugs.webkit.org/show_bug.cgi?id=232936
+
+ Reviewed by Michael Catanzaro.
+
+ g-ir-compiler is using a C compiler internally, so it needs to set
+ the proper flags for it.
+
+ * PlatformGTK.cmake:
+
2022-02-21 Robin Morisset <[email protected]>
[JSC] Format the output of --reportTotalPhaseTimes=1 more nicely
Modified: releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/PlatformGTK.cmake (290430 => 290431)
--- releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/PlatformGTK.cmake 2022-02-24 15:45:46 UTC (rev 290430)
+++ releases/WebKitGTK/webkit-2.36/Source/_javascript_Core/PlatformGTK.cmake 2022-02-24 16:08:45 UTC (rev 290431)
@@ -71,7 +71,7 @@
add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
DEPENDS _javascript_Core
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS=
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
${INTROSPECTION_SCANNER}
--quiet
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog (290430 => 290431)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog 2022-02-24 15:45:46 UTC (rev 290430)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/ChangeLog 2022-02-24 16:08:45 UTC (rev 290431)
@@ -1,3 +1,15 @@
+2022-02-22 Alexander Kanavin <[email protected]>
+
+ When building introspection files, add CMAKE_C_FLAGS to the compiler flags.
+ https://bugs.webkit.org/show_bug.cgi?id=232936
+
+ Reviewed by Michael Catanzaro.
+
+ g-ir-compiler is using a C compiler internally, so it needs to set
+ the proper flags for it.
+
+ * PlatformGTK.cmake:
+
2022-02-23 Pablo Saavedra <[email protected]>
[GTK][WPE] PlatformDisplay::terminateEglDisplays() is never called
Modified: releases/WebKitGTK/webkit-2.36/Source/WebKit/PlatformGTK.cmake (290430 => 290431)
--- releases/WebKitGTK/webkit-2.36/Source/WebKit/PlatformGTK.cmake 2022-02-24 15:45:46 UTC (rev 290430)
+++ releases/WebKitGTK/webkit-2.36/Source/WebKit/PlatformGTK.cmake 2022-02-24 16:08:45 UTC (rev 290431)
@@ -675,7 +675,7 @@
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=
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}" LDFLAGS=
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
${INTROSPECTION_SCANNER}
--quiet
@@ -721,7 +721,7 @@
OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
DEPENDS WebKit2-${WEBKITGTK_API_VERSION}-gir
- COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS="-Wno-deprecated-declarations ${CMAKE_C_FLAGS}"
LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
${INTROSPECTION_SCANNER}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
