helium-3rd-party/meta-openembedded
1
0
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-05-18 22:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

leveldb: Fix parallel build

Browse Source 
Add build parallelism, since we do not use oe_runmake

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2017-09-21 20:23:15 -07:00 committed by Martin Jansa
parent 107071acc6
commit db68fbc784
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch Normal file
View File

@ -0,0 +1,35 @@
From c85978e77725ef233543370d24e23f853f449170 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 21 Sep 2017 17:47:02 -0700
Subject: [PATCH] Makefile: Fix parallel build
Sometimes mkdir $(SHARED_OUTDIR)/db races with compiler which is
creating .o file in the same directory $(SHARED_OUTDIR)/db/db_bench.o
Fixes error like
| mkdir out-static
| mkdir out-shared/db
| Assembler messages:
| Fatal error: can't create out-shared/db/db_bench.o: No such file or directory
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Upstream-Status: Submitted
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: git/Makefile
===================================================================
--- git.orig/Makefile
+++ git/Makefile
@@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/wri
$(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS)
$(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS)
-$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
+$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db $(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL)
$(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS)
.PHONY: run-shared

3
meta-oe/recipes-extended/leveldb/leveldb_git.bb
View File

@ -10,6 +10,7 @@ PV = "1.20+git${SRCPV}"
SRC_URI = "git://github.com/google/${BPN}.git \
file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \
file://0002-makefile-build-SHARED_MEMENVLIB.patch \
file://0001-Makefile-Fix-parallel-build.patch \
"
S = "${WORKDIR}/git"
@ -19,7 +20,7 @@ inherit utils
do_compile() {
# do not use oe_runmake. oe_runmake pass to make compilation arguments and override
# leveldb makefile variable CFLAGS and broke leveldb build.
CFLAGS="${CFLAGS}" make || die
CFLAGS="${CFLAGS}" make ${PARALLEL_MAKE}|| die
}
do_install() {