Patchwork [1/2] webkit-gtk: remove no-parallel bodge

login
register
mail settings
Submitter Ross Burton
Date July 17, 2012, 6:44 p.m.
Message ID <e64968581ead699c19087675b57e6027c8252e6c.1342550573.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/32301/
State Accepted
Commit 90ca88a6f9dd5e2bc055739f84cb224f9a82455a
Headers show

Comments

Ross Burton - July 17, 2012, 6:44 p.m.
This workaround was originally for GNU Make 3.82 which upstream was blaming
for a parallel build failure.  Since then I've changed numerous variables
and now parallel builds are working with 3.82 (and succeed in 20 minutes
instead of 2 hours).

Revert the change until we've more data about what causes the breakage, then
we can bring it back with more finesse.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb |    5 -----
 1 file changed, 5 deletions(-)

Patch

diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
index b2bfd24..3cef0e4 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb
@@ -29,11 +29,6 @@  inherit autotools lib_package pkgconfig
 
 S = "${WORKDIR}/webkit-${PV}/"
 
-# GNU Make 3.82 has a bug where it incorrectly prunes intermediate targets in
-# parallel builds.  See https://bugs.webkit.org/show_bug.cgi?id=79498 for the
-# WebKitGTK bug, and savannah.gnu.org/bugs/?30653 for the upstream bug.
-PARALLEL_MAKE = ""
-
 EXTRA_OECONF = "\
                 --enable-debug=no \
                 --enable-svg \