diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2016-09-08 15:26:16 +0300 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-09-08 22:36:09 +0200 |
| commit | e14ae6f9e4058a136e153bb89669c1fc329a6376 (patch) | |
| tree | 4a89b0b0db57d92c4ddd3603dc6480f8bed1c1fa | |
| parent | d981c4b34a87db5833f42f050d7f548926994c98 (diff) | |
| download | buildroot-e14ae6f9e4058a136e153bb89669c1fc329a6376.tar.gz buildroot-e14ae6f9e4058a136e153bb89669c1fc329a6376.zip | |
leveldb: fix static build
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>
| -rw-r--r-- | package/leveldb/leveldb.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk index 2ce3e4ace4..ca2ed703a0 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 |
