[Buildroot] [PATCH 1/2] leveldb: fix static build

[Buildroot] [PATCH 1/2] leveldb: fix static build

[Baruch Siach]

Since version 1.19 Makefile variable names changed. Update the build command
accordingly.

While at it, remove variables that Makefile doesn't use anymore. This change
means that the static library is always build, even when BR2_SHARED_LIBS=y,
since the static library name is hard coded in leveldb Makefile.

Fixes:
http://autobuild.buildroot.net/results/00c/00c8c5a1d6001eaebfe2a9f848dd292c91bf6a79/

Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/leveldb/leveldb.mk | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk
index 2ce3e4ace4ed..ca2ed703a0bd 100644
--- a/package/leveldb/leveldb.mk
+++ b/package/leveldb/leveldb.mk
@@ -11,17 +11,9 @@ LEVELDB_LICENSE_FILES = LICENSE
 LEVELDB_INSTALL_STAGING = YES
 LEVELDB_DEPENDENCIES = snappy
 
-# We will pass optimisation level via CFLAGS so remove leveldb default
-LEVELDB_MAKE_ARGS += OPTIM=
-
-# Disable the static library for shared only build
-ifeq ($(BR2_SHARED_LIBS),y)
-LEVELDB_MAKE_ARGS += LIBRARY=
-endif
-
 # Disable the shared library for static only build
 ifeq ($(BR2_STATIC_LIBS),y)
-LEVELDB_MAKE_ARGS += SHARED=
+LEVELDB_MAKE_ARGS += SHARED_LIBS= SHARED_PROGRAMS=
 endif
 
 define LEVELDB_BUILD_CMDS
-- 
2.9.3

[Buildroot] [PATCH 2/2] leveldb: fix staging and target installation

[Baruch Siach]

The patch adding target/staging installation support needs variable names
update to account for upstream changes in version 1.19.

Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/leveldb/0002-Add-install-recipe.patch | 30 +++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/package/leveldb/0002-Add-install-recipe.patch b/package/leveldb/0002-Add-install-recipe.patch
index 8645a6464c9c..f65916f1eb46 100644
--- a/package/leveldb/0002-Add-install-recipe.patch
+++ b/package/leveldb/0002-Add-install-recipe.patch
@@ -1,21 +1,23 @@
-From 818d59f093100d5f39db34d5686a9d983172d307 Mon Sep 17 00:00:00 2001
+From bf646b73391d3d2d0b9780a399dd24880c66b9ab Mon Sep 17 00:00:00 2001
 From: Steve James <ste@junkomatic.net>
 Date: Sun, 5 Apr 2015 16:30:46 +0200
 Subject: [PATCH 2/2] Add install recipe
 
-Upstream-Status: Submitted [https://github.com/google/leveldb/pull/276]
+Upstream-Status: Rejected [https://github.com/google/leveldb/pull/276]
 
 Signed-off-by: Steve James <ste@junkomatic.net>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[baruch: update for v1.19]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 ---
- Makefile | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ Makefile | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index 2bd2cad..530f2c3 100644
+index 07a5a1ead6fd..c87023db527a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -412,3 +412,19 @@ else
+@@ -412,3 +412,17 @@ $(SHARED_OUTDIR)/%.o: %.cc
  
  $(SHARED_OUTDIR)/%.o: %.c
  	$(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@
@@ -23,18 +25,16 @@ index 2bd2cad..530f2c3 100644
 +INSTALL_ROOT = /
 +INSTALL_PREFIX= usr/local
 +
-+install: $(SHARED) $(LIBRARY)
++install: all
 +	install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb
 +	install -D -m 0644 include/leveldb/*.h $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb
 +	install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib
-+  ifneq (,$(LIBRARY))
-+	install -m 0644 $(LIBRARY) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib
-+  endif
-+  ifneq (,$(SHARED))
-+	install -m 0755 $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib
-+	ln -sf $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED1)
-+	ln -sf $(SHARED3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED2)
-+  endif
++	install -m 0644 $(STATIC_OUTDIR)/libleveldb.a $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib
++ifneq (,$(SHARED_LIBS))
++	install -m 0755 $(SHARED_OUTDIR)/$(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib
++	ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB1)
++	ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB2)
++endif
 -- 
 2.1.0
 
-- 
2.9.3