Title: [161496] trunk
Revision
161496
Author
[email protected]
Date
2014-01-08 06:35:12 -0800 (Wed, 08 Jan 2014)

Log Message

REGRESSION(r160304): [GTK] Disable libtool fast install
https://bugs.webkit.org/show_bug.cgi?id=126381

Reviewed by Gustavo Noronha Silva.

.:

Don't disable the libtool fast-install mode unconditionally by
default.

If the fast-install mode is disabled, binaries are generated ready
to use the libraries directly from the build tree. If we use the
GNU linker, those binaries are then relinked when they are
installed.

However, libtool fails to do it properly when an installation
prefix is set with DESTDIR, and ends up installing the libtool
wrappers instead of the actual binaries.

* Source/autotools/SetupLibtool.m4:

Tools:

Disable the libtool fast-install mode in developer/test builds.

In this mode binaries are generated ready to be used directly from
the build tree. Otherwise they would need to be relinked when they
are executed, which can take a lot of resources, particularly in
debug builds.

* Scripts/webkitdirs.pm:
(runAutogenForAutotoolsProjectIfNecessary):

Modified Paths

Diff

Modified: trunk/ChangeLog (161495 => 161496)


--- trunk/ChangeLog	2014-01-08 14:22:09 UTC (rev 161495)
+++ trunk/ChangeLog	2014-01-08 14:35:12 UTC (rev 161496)
@@ -1,3 +1,24 @@
+2014-01-08  Alberto Garcia  <[email protected]>
+
+        REGRESSION(r160304): [GTK] Disable libtool fast install
+        https://bugs.webkit.org/show_bug.cgi?id=126381
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Don't disable the libtool fast-install mode unconditionally by
+        default.
+
+        If the fast-install mode is disabled, binaries are generated ready
+        to use the libraries directly from the build tree. If we use the
+        GNU linker, those binaries are then relinked when they are
+        installed.
+
+        However, libtool fails to do it properly when an installation
+        prefix is set with DESTDIR, and ends up installing the libtool
+        wrappers instead of the actual binaries.
+
+        * Source/autotools/SetupLibtool.m4:
+
 2014-01-07  Gustavo Noronha Silva  <[email protected]>
 
         Unreviewed GTK/CMake build fix: use the correct location for docs-build.stamp

Modified: trunk/Source/autotools/SetupLibtool.m4 (161495 => 161496)


--- trunk/Source/autotools/SetupLibtool.m4	2014-01-08 14:22:09 UTC (rev 161495)
+++ trunk/Source/autotools/SetupLibtool.m4	2014-01-08 14:35:12 UTC (rev 161496)
@@ -12,7 +12,6 @@
 
 DOLT
 AC_DISABLE_STATIC
-AC_DISABLE_FAST_INSTALL
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 

Modified: trunk/Tools/ChangeLog (161495 => 161496)


--- trunk/Tools/ChangeLog	2014-01-08 14:22:09 UTC (rev 161495)
+++ trunk/Tools/ChangeLog	2014-01-08 14:35:12 UTC (rev 161496)
@@ -1,3 +1,20 @@
+2014-01-08  Alberto Garcia  <[email protected]>
+
+        REGRESSION(r160304): [GTK] Disable libtool fast install
+        https://bugs.webkit.org/show_bug.cgi?id=126381
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Disable the libtool fast-install mode in developer/test builds.
+
+        In this mode binaries are generated ready to be used directly from
+        the build tree. Otherwise they would need to be relinked when they
+        are executed, which can take a lot of resources, particularly in
+        debug builds.
+
+        * Scripts/webkitdirs.pm:
+        (runAutogenForAutotoolsProjectIfNecessary):
+
 2014-01-08  Zan Dobersek  <[email protected]>
 
         Unreviewed GTK gardening.

Modified: trunk/Tools/Scripts/webkitdirs.pm (161495 => 161496)


--- trunk/Tools/Scripts/webkitdirs.pm	2014-01-08 14:22:09 UTC (rev 161495)
+++ trunk/Tools/Scripts/webkitdirs.pm	2014-01-08 14:35:12 UTC (rev 161496)
@@ -1784,6 +1784,9 @@
     # Also, always enable developer mode for developer/test builds.
     unshift(@buildArgs, "--enable-developer-mode");
 
+    # Optimize for running WebKit inside the build tree
+    unshift(@buildArgs, "--disable-fast-install");
+
     my $joinedBuildArgs = join(" ", @buildArgs);
 
     if (-e "GNUmakefile") {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to