NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

leveldb: fix static build

Browse Source 
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Baruch Siach 2016-09-08 15:26:16 +03:00 committed by Thomas Petazzoni
parent d981c4b34a
commit e14ae6f9e4
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/leveldb/leveldb.mk
View File

@ -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