* [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build"
@ 2019-01-29 19:39 Fabrice Fontaine
2019-01-29 19:39 ` [Buildroot] [PATCH 2/2] leveldb: disable parallel build Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2019-01-29 19:39 UTC (permalink / raw)
To: buildroot
This reverts commit abba4e701246f69bc22ca9045e9932abfe9228e9.
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/leveldb/0003-fix-parallel-build.patch | 36 ---------------------------
1 file changed, 36 deletions(-)
delete mode 100644 package/leveldb/0003-fix-parallel-build.patch
diff --git a/package/leveldb/0003-fix-parallel-build.patch b/package/leveldb/0003-fix-parallel-build.patch
deleted file mode 100644
index 8aafbc2e02..0000000000
--- a/package/leveldb/0003-fix-parallel-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 293e1b08317567b2e479d24530986676ae4d2221 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 8 Oct 2018 23:08:19 +0200
-Subject: [PATCH] fix parallel build
-
-Build of leveldb sometimes fails on:
-Fatal error: can't create out-shared/db/db_bench.o: No such file or directory
-
-Fix this, by creating $(SHARED_OUTDIR) before building
-(SHARED_OUTDIR)/db/db_bench.o
-
-Fixes:
- - http://autobuild.buildroot.net/results/945bb8096c1f98f307161a6def5a9f7f25b2454a
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: not upstreamable as upstream switched to cmake]
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index f7cc7d7..edb56a5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -386,7 +386,7 @@ $(STATIC_OUTDIR)/write_batch_test:db/write_batch_test.cc $(STATIC_LIBOBJECTS) $(
- $(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) $(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
---
-2.17.1
-
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/2] leveldb: disable parallel build
2019-01-29 19:39 [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build" Fabrice Fontaine
@ 2019-01-29 19:39 ` Fabrice Fontaine
2019-01-30 7:38 ` Peter Korsgaard
2019-01-30 9:43 ` Peter Korsgaard
2019-01-30 7:38 ` [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build" Peter Korsgaard
2019-01-30 9:43 ` Peter Korsgaard
2 siblings, 2 replies; 6+ messages in thread
From: Fabrice Fontaine @ 2019-01-29 19:39 UTC (permalink / raw)
To: buildroot
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>
---
package/leveldb/leveldb.mk | 6 +++---
1 file 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
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build"
2019-01-29 19:39 [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build" Fabrice Fontaine
2019-01-29 19:39 ` [Buildroot] [PATCH 2/2] leveldb: disable parallel build Fabrice Fontaine
@ 2019-01-30 7:38 ` Peter Korsgaard
2019-01-30 9:43 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2019-01-30 7:38 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> This reverts commit abba4e701246f69bc22ca9045e9932abfe9228e9.
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build"
2019-01-29 19:39 [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build" Fabrice Fontaine
2019-01-29 19:39 ` [Buildroot] [PATCH 2/2] leveldb: disable parallel build Fabrice Fontaine
2019-01-30 7:38 ` [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build" Peter Korsgaard
@ 2019-01-30 9:43 ` Peter Korsgaard
2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2019-01-30 9:43 UTC (permalink / raw)
To: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> This reverts commit abba4e701246f69bc22ca9045e9932abfe9228e9.
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2018.02.x and 2018.11.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-01-30 9:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-29 19:39 [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build" Fabrice Fontaine
2019-01-29 19:39 ` [Buildroot] [PATCH 2/2] leveldb: disable parallel build Fabrice Fontaine
2019-01-30 7:38 ` Peter Korsgaard
2019-01-30 9:43 ` Peter Korsgaard
2019-01-30 7:38 ` [Buildroot] [PATCH 1/2] Revert "leveldb: fix parallel build" Peter Korsgaard
2019-01-30 9:43 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.