diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-09-21 20:23:15 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-10-02 12:35:39 +0000 |
commit | db68fbc7846ae9e950d907c18056d29dcdc81374 (patch) | |
tree | d219b48f6f131742f33fd3d1312c1ce373024aab /meta-oe/recipes-extended | |
parent | 107071acc6a0694db61a64b5b8c926790fa14bcf (diff) | |
download | meta-openembedded-db68fbc7846ae9e950d907c18056d29dcdc81374.tar.gz |
leveldb: Fix parallel build
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>
Diffstat (limited to 'meta-oe/recipes-extended')
-rw-r--r-- | meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-extended/leveldb/leveldb_git.bb | 3 |
2 files changed, 37 insertions, 1 deletions
diff --git a/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch b/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch new file mode 100644 index 000000000..5068654e2 --- /dev/null +++ b/meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From c85978e77725ef233543370d24e23f853f449170 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 21 Sep 2017 17:47:02 -0700 | ||
4 | Subject: [PATCH] Makefile: Fix parallel build | ||
5 | |||
6 | Sometimes mkdir $(SHARED_OUTDIR)/db races with compiler which is | ||
7 | creating .o file in the same directory $(SHARED_OUTDIR)/db/db_bench.o | ||
8 | |||
9 | Fixes error like | ||
10 | |||
11 | | mkdir out-static | ||
12 | | mkdir out-shared/db | ||
13 | | Assembler messages: | ||
14 | | Fatal error: can't create out-shared/db/db_bench.o: No such file or directory | ||
15 | |||
16 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
17 | --- | ||
18 | Upstream-Status: Submitted | ||
19 | |||
20 | Makefile | 4 ++-- | ||
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
22 | |||
23 | Index: git/Makefile | ||
24 | =================================================================== | ||
25 | --- git.orig/Makefile | ||
26 | +++ git/Makefile | ||
27 | @@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/wri | ||
28 | $(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) | ||
29 | $(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS) | ||
30 | |||
31 | -$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) | ||
32 | +$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db $(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) | ||
33 | $(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS) | ||
34 | |||
35 | .PHONY: run-shared | ||
diff --git a/meta-oe/recipes-extended/leveldb/leveldb_git.bb b/meta-oe/recipes-extended/leveldb/leveldb_git.bb index dfe4b459a..8fec89c6f 100644 --- a/meta-oe/recipes-extended/leveldb/leveldb_git.bb +++ b/meta-oe/recipes-extended/leveldb/leveldb_git.bb | |||
@@ -10,6 +10,7 @@ PV = "1.20+git${SRCPV}" | |||
10 | SRC_URI = "git://github.com/google/${BPN}.git \ | 10 | SRC_URI = "git://github.com/google/${BPN}.git \ |
11 | file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \ | 11 | file://0001-build_detect_platform-Check-for-__SSE4_2__.patch \ |
12 | file://0002-makefile-build-SHARED_MEMENVLIB.patch \ | 12 | file://0002-makefile-build-SHARED_MEMENVLIB.patch \ |
13 | file://0001-Makefile-Fix-parallel-build.patch \ | ||
13 | " | 14 | " |
14 | 15 | ||
15 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
@@ -19,7 +20,7 @@ inherit utils | |||
19 | do_compile() { | 20 | do_compile() { |
20 | # do not use oe_runmake. oe_runmake pass to make compilation arguments and override | 21 | # do not use oe_runmake. oe_runmake pass to make compilation arguments and override |
21 | # leveldb makefile variable CFLAGS and broke leveldb build. | 22 | # leveldb makefile variable CFLAGS and broke leveldb build. |
22 | CFLAGS="${CFLAGS}" make || die | 23 | CFLAGS="${CFLAGS}" make ${PARALLEL_MAKE}|| die |
23 | } | 24 | } |
24 | 25 | ||
25 | do_install() { | 26 | do_install() { |