Title: [104706] trunk/Source/WebKit2
- Revision
- 104706
- Author
- [email protected]
- Date
- 2012-01-11 05:54:06 -0800 (Wed, 11 Jan 2012)
Log Message
[GTK] Linking of big binaries should be serialized to avoid thrashing
https://bugs.webkit.org/show_bug.cgi?id=75977
Patch by Gustavo Noronha Silva <[email protected]> on 2012-01-11
Reviewed by Martin Robinson.
Added artificial dependencies so that libwebkitgtk is always
linked first, libwebkit2gtk second, and WebKitPluginProcess
last. Automake unfortunately replaces the whole rule used to build
the libraries if the actual name is used to add the dependency, so
we use helper variables to work around that.
* GNUmakefile.am:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (104705 => 104706)
--- trunk/Source/WebKit2/ChangeLog 2012-01-11 13:50:20 UTC (rev 104705)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-11 13:54:06 UTC (rev 104706)
@@ -1,3 +1,18 @@
+2012-01-11 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] Linking of big binaries should be serialized to avoid thrashing
+ https://bugs.webkit.org/show_bug.cgi?id=75977
+
+ Reviewed by Martin Robinson.
+
+ Added artificial dependencies so that libwebkitgtk is always
+ linked first, libwebkit2gtk second, and WebKitPluginProcess
+ last. Automake unfortunately replaces the whole rule used to build
+ the libraries if the actual name is used to add the dependency, so
+ we use helper variables to work around that.
+
+ * GNUmakefile.am:
+
2012-01-11 Ryuan Choi <[email protected]>
[EFL][WK2] Rename viewObject to viewWidget
Modified: trunk/Source/WebKit2/GNUmakefile.am (104705 => 104706)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-01-11 13:50:20 UTC (rev 104705)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-01-11 13:54:06 UTC (rev 104706)
@@ -1011,6 +1011,12 @@
lib_LTLIBRARIES += \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+# Artificial dependency to make sure libwebkit2gtk and libwebkitgtk are not linked at the same time
+# The variable creation is to avoid having automake override the entire rule instead of adding the
+# dependency.
+webkit2gtk_lib_for_dep = libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+$(webkit2gtk_lib_for_dep): libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = \
$(libwebkit2gtkincludedir)/WebKit2
@@ -1271,6 +1277,10 @@
libexec_PROGRAMS += \
Programs/WebKitPluginProcess
+# Serialize linking of the plugin process with both webkit libraries.
+plugin_process_for_dep = Programs/WebKitPluginProcess
+$(plugin_process_for_dep): libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+
Programs_WebKitPluginProcess_CPPFLAGS = \
-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
-I$(srcdir)/Source/WebKit2 \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
