diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-07-17 19:44:19 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-18 14:29:30 +0100 |
| commit | e4c43e2f186b86d00fd285dff1b2dedc60c01172 (patch) | |
| tree | 988f2ea3fef9224480b3c388e56331ea5c69a4d6 /meta/recipes-sato | |
| parent | 707cd32457edf014a2e8bd88edd0c453838b18e1 (diff) | |
| download | poky-e4c43e2f186b86d00fd285dff1b2dedc60c01172.tar.gz | |
webkit-gtk: remove no-parallel bodge
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.
(From OE-Core rev: 90ca88a6f9dd5e2bc055739f84cb224f9a82455a)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | 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 b2bfd24904..3cef0e48fa 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 | |||
| 29 | 29 | ||
| 30 | S = "${WORKDIR}/webkit-${PV}/" | 30 | S = "${WORKDIR}/webkit-${PV}/" |
| 31 | 31 | ||
| 32 | # GNU Make 3.82 has a bug where it incorrectly prunes intermediate targets in | ||
| 33 | # parallel builds. See https://bugs.webkit.org/show_bug.cgi?id=79498 for the | ||
| 34 | # WebKitGTK bug, and savannah.gnu.org/bugs/?30653 for the upstream bug. | ||
| 35 | PARALLEL_MAKE = "" | ||
| 36 | |||
| 37 | EXTRA_OECONF = "\ | 32 | EXTRA_OECONF = "\ |
| 38 | --enable-debug=no \ | 33 | --enable-debug=no \ |
| 39 | --enable-svg \ | 34 | --enable-svg \ |
