Title: [151899] releases/WebKitGTK/webkit-2.0/Source/WebKit2
- Revision
- 151899
- Author
- [email protected]
- Date
- 2013-06-24 01:32:45 -0700 (Mon, 24 Jun 2013)
Log Message
Merge r151492 - [GTK] Remove the WebCoreLayer(Gtk2).a archives before regenerating them
https://bugs.webkit.org/show_bug.cgi?id=116723
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
* GNUmakefile.am: When generating the WebCoreLayerGtk2.a archive from all the dependency archives, remove the
current archive (if any). Updating an existent archive in an incremental build is not bulletproof and can lead
to corrupt archives and subsequent build failures. On the other hand, the archive generation is not expensive
and produces a working archive without problems even on incremental builds.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (151898 => 151899)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-24 08:26:25 UTC (rev 151898)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-06-24 08:32:45 UTC (rev 151899)
@@ -1,3 +1,15 @@
+2013-06-12 Zan Dobersek <[email protected]>
+
+ [GTK] Remove the WebCoreLayer(Gtk2).a archives before regenerating them
+ https://bugs.webkit.org/show_bug.cgi?id=116723
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: When generating the WebCoreLayerGtk2.a archive from all the dependency archives, remove the
+ current archive (if any). Updating an existent archive in an incremental build is not bulletproof and can lead
+ to corrupt archives and subsequent build failures. On the other hand, the archive generation is not expensive
+ and produces a working archive without problems even on incremental builds.
+
2013-05-29 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix make distcheck.
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am (151898 => 151899)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am 2013-06-24 08:26:25 UTC (rev 151898)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/GNUmakefile.am 2013-06-24 08:32:45 UTC (rev 151899)
@@ -543,6 +543,7 @@
WebCoreLayerGtk2.a: $(webcore_layer_gtk2_deps)
$(AM_V_GEN)
+ $(AM_V_at)$(shell rm -f $@)
$(AM_V_at)$(foreach archive, $(webcore_layer_gtk2_archives), $(shell ar t $(archive) | xargs -n50 ar cruT $@))
DISTCLEANFILES += \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes