summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2013-09-09 09:27:55 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-09-09 09:27:55 (GMT)
commit33a9d34ff375ec0c0389c9af6bc499a8dd7ccbc9 (patch)
tree5c3f8d85f2217616788a747567d73e02fa0a2896
parent0175dce8bce9528bf7600e43158cfcf7e9b18331 (diff)
downloadbuildroot-33a9d34ff375ec0c0389c9af6bc499a8dd7ccbc9.tar.gz
buildroot-33a9d34ff375ec0c0389c9af6bc499a8dd7ccbc9.tar.bz2
webkit: fix staging install
Parallel 'make install' seems to deadlock here (make 3.81). Work around it by disabling parallel make for the install step. We only disable parallel make for the install step, as the build step works with parallel make, and webkit is a huge package, so build time goes up significantly with make -j1. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/webkit/webkit.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk
index 99a90b9..eb1547b 100644
--- a/package/webkit/webkit.mk
+++ b/package/webkit/webkit.mk
@@ -15,6 +15,9 @@ WEBKIT_DEPENDENCIES = host-ruby host-flex host-bison host-gperf enchant harfbuzz
WEBKIT_AUTORECONF = YES
WEBKIT_AUTORECONF_OPT = -I $(@D)/Source/autotools
+# parallel make install deadlocks with make 3.81
+WEBKIT_INSTALL_STAGING_OPT = -j1 DESTDIR=$(STAGING_DIR) install
+
# Does not build and it's disabled by default
# in newer releases
define DISABLE_INDEXED_DATABASE