Title: [271580] trunk/Source
- Revision
- 271580
- Author
- [email protected]
- Date
- 2021-01-18 07:56:48 -0800 (Mon, 18 Jan 2021)
Log Message
[GTK] Multilib conflicts in gir files
https://bugs.webkit.org/show_bug.cgi?id=220636
Patch by Michael Catanzaro <[email protected]> on 2021-01-18
Reviewed by Carlos Garcia Campos.
Source/_javascript_Core:
* PlatformGTK.cmake:
Source/WebKit:
By passing --sources-top-dirs to g-ir-scanner, we ensure all paths in the generated gir
files are relative to the toplevel builddir. This avoids multilib conflicts when the
builddir contains the target architecture.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (271579 => 271580)
--- trunk/Source/_javascript_Core/ChangeLog 2021-01-18 13:16:36 UTC (rev 271579)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-01-18 15:56:48 UTC (rev 271580)
@@ -1,3 +1,12 @@
+2021-01-18 Michael Catanzaro <[email protected]>
+
+ [GTK] Multilib conflicts in gir files
+ https://bugs.webkit.org/show_bug.cgi?id=220636
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake:
+
2021-01-18 Yusuke Suzuki <[email protected]>
[JSC] callerIsOMGCompiled should be robust
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (271579 => 271580)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-01-18 13:16:36 UTC (rev 271579)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2021-01-18 15:56:48 UTC (rev 271580)
@@ -78,6 +78,7 @@
--pkg=gobject-2.0
--pkg-export=_javascript_coregtk-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/_javascript_Core-${WEBKITGTK_API_VERSION}.gir
+ --sources-top-dirs=${CMAKE_BINARY_DIR}
--c-include="jsc/jsc.h"
-DJSC_COMPILATION
-I${CMAKE_SOURCE_DIR}/Source
Modified: trunk/Source/WebKit/ChangeLog (271579 => 271580)
--- trunk/Source/WebKit/ChangeLog 2021-01-18 13:16:36 UTC (rev 271579)
+++ trunk/Source/WebKit/ChangeLog 2021-01-18 15:56:48 UTC (rev 271580)
@@ -1,3 +1,16 @@
+2021-01-18 Michael Catanzaro <[email protected]>
+
+ [GTK] Multilib conflicts in gir files
+ https://bugs.webkit.org/show_bug.cgi?id=220636
+
+ Reviewed by Carlos Garcia Campos.
+
+ By passing --sources-top-dirs to g-ir-scanner, we ensure all paths in the generated gir
+ files are relative to the toplevel builddir. This avoids multilib conflicts when the
+ builddir contains the target architecture.
+
+ * PlatformGTK.cmake:
+
2021-01-17 Yusuke Suzuki <[email protected]>
JITOperation does not exist in WebKit
Modified: trunk/Source/WebKit/PlatformGTK.cmake (271579 => 271580)
--- trunk/Source/WebKit/PlatformGTK.cmake 2021-01-18 13:16:36 UTC (rev 271579)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2021-01-18 15:56:48 UTC (rev 271580)
@@ -677,6 +677,7 @@
--pkg=libsoup-2.4
--pkg-export=webkit2gtk-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+ --sources-top-dirs=${CMAKE_BINARY_DIR}
--c-include="webkit2/webkit2.h"
-DBUILDING_WEBKIT
-DWEBKIT2_COMPILATION
@@ -724,6 +725,7 @@
--pkg=libsoup-2.4
--pkg-export=webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}
--output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
+ --sources-top-dirs=${CMAKE_BINARY_DIR}
--c-include="webkit2/webkit-web-extension.h"
-DBUILDING_WEBKIT
-DWEBKIT2_COMPILATION
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
