From patchwork Wed Jul 18 07:42:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED,PULL,13/18] webkit-gtk: remove no-parallel bodge Date: Wed, 18 Jul 2012 07:42:42 -0000 From: Saul Wold X-Patchwork-Id: 32387 Message-Id: To: openembedded-core@lists.openembedded.org From: Ross Burton 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 Signed-off-by: Saul Wold --- meta/recipes-sato/webkit/webkit-gtk_1.8.1.bb | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) 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 \