diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-10-03 12:09:31 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-10-04 14:53:32 +0000 |
commit | 77a6793fb9a1a5c6c57e905ccd8c262d5e8c8951 (patch) | |
tree | 58083015cb47e3b8c726c2b04bcf8cce5a96f286 /meta-oe/recipes-extended/leveldb | |
parent | 398efac6009f03735bf2347770033c04ea784b6a (diff) | |
download | meta-openembedded-77a6793fb9a1a5c6c57e905ccd8c262d5e8c8951.tar.gz |
leveldb: fix parallel build II
* I was still able to reproduce the build failure which was supposed to be
fixed by this patch.
* added comment suggesting to do the same in:
https://github.com/google/leveldb/pull/512/commits/6a6541b339b84070f585ffa1a437ef0e2ae22c9c
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/leveldb')
-rw-r--r-- | meta-oe/recipes-extended/leveldb/leveldb/0001-Makefile-Fix-parallel-build.patch | 15 |
1 files changed, 7 insertions, 8 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 index 5068654e2..3135d4d5a 100644 --- 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 | |||
@@ -20,16 +20,15 @@ Upstream-Status: Submitted | |||
20 | Makefile | 4 ++-- | 20 | Makefile | 4 ++-- |
21 | 1 file changed, 2 insertions(+), 2 deletions(-) | 21 | 1 file changed, 2 insertions(+), 2 deletions(-) |
22 | 22 | ||
23 | Index: git/Makefile | 23 | diff --git a/Makefile b/Makefile |
24 | =================================================================== | 24 | index f7cc7d7..51a0bcd 100644 |
25 | --- git.orig/Makefile | 25 | --- a/Makefile |
26 | +++ git/Makefile | 26 | +++ b/Makefile |
27 | @@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/wri | 27 | @@ -386,6 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/write_batch_test.cc $(STATIC_LIBOBJECTS) $( |
28 | $(STATIC_OUTDIR)/memenv_test:$(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) | 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) | 29 | $(XCRUN) $(CXX) $(LDFLAGS) $(STATIC_OUTDIR)/helpers/memenv/memenv_test.o $(STATIC_OUTDIR)/libmemenv.a $(STATIC_OUTDIR)/libleveldb.a $(TESTHARNESS) -o $@ $(LIBS) |
30 | 30 | ||
31 | -$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) | 31 | +$(SHARED_OUTDIR)/db/db_bench.o: | $(SHARED_OUTDIR)/db |
32 | +$(SHARED_OUTDIR)/db_bench:$(SHARED_OUTDIR)/db $(SHARED_OUTDIR)/db/db_bench.o $(SHARED_LIBS) $(TESTUTIL) | 32 | $(SHARED_OUTDIR)/db_bench:$(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) | 33 | $(XCRUN) $(CXX) $(LDFLAGS) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(SHARED_OUTDIR)/db/db_bench.o $(TESTUTIL) $(SHARED_OUTDIR)/$(SHARED_LIB3) -o $@ $(LIBS) |
34 | 34 | ||
35 | .PHONY: run-shared | ||