aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2019-01-29 20:39:29 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2019-01-30 10:43:34 +0100
commitbbbdfe7acaddc1ef9f5576af875b07c1892d4db5 (patch)
tree8868b0f661507c42c15f5cd76ea6b66ba7efad77
parent424fad718dfecc7370dad4015db594e2d43625f4 (diff)
downloadbuildroot-bbbdfe7acaddc1ef9f5576af875b07c1892d4db5.tar.gz
buildroot-bbbdfe7acaddc1ef9f5576af875b07c1892d4db5.tar.bz2
leveldb: disable parallel build
Commit abba4e701246f69bc22ca9045e9932abfe9228e9 did not succeed in fixing all parallel build failures because sometimes $(SHARED_OUTDIR) is created but not $(SHARED_OUTDIR)/db so instead of fixing this mess, revert the patch and disable parallel build as upstream switched to cmake Fixes: - http://autobuild.buildroot.org/results/9c33692aa130a20b0f8e868156e49990e862d6ee Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit fb22931bcfa66e2b1c8788245876ad7fed134477) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/leveldb/leveldb.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk
index 54942a0f27..af9e879828 100644
--- a/package/leveldb/leveldb.mk
+++ b/package/leveldb/leveldb.mk
@@ -17,18 +17,18 @@ LEVELDB_MAKE_ARGS += SHARED_LIBS= SHARED_PROGRAMS=
endif
define LEVELDB_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
+ $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) \
$(LEVELDB_MAKE_ARGS) -C $(@D)
endef
define LEVELDB_INSTALL_STAGING_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) \
+ $(TARGET_MAKE_ENV) $(MAKE1) \
INSTALL_ROOT=$(STAGING_DIR) INSTALL_PREFIX=/usr \
$(LEVELDB_MAKE_ARGS) -C $(@D) install
endef
define LEVELDB_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) \
+ $(TARGET_MAKE_ENV) $(MAKE1) \
INSTALL_ROOT=$(TARGET_DIR) INSTALL_PREFIX=/usr \
$(LEVELDB_MAKE_ARGS) -C $(@D) install
endef