update buildroot to 2017.02.11
This commit is contained in:
jbnadal
@@ -0,0 +1,31 @@
|
||||
From 8a8016f6d2af335ab205aa40d5274fc9b0c7a566 Mon Sep 17 00:00:00 2001
|
||||
From: Steve James <ste@junkomatic.net>
|
||||
Date: Sun, 5 Apr 2015 16:29:51 +0200
|
||||
Subject: [PATCH 1/2] Fix compilation with g++ 4.8.2
|
||||
|
||||
Where db_iter.cc fails to get a typedef for ssize_t when compiled by
|
||||
GCC.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/google/leveldb/issues/233]
|
||||
|
||||
Signed-off-by: Steve James <ste@junkomatic.net>
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
db/db_iter.cc | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/db/db_iter.cc b/db/db_iter.cc
|
||||
index 3b2035e..c2e5f35 100644
|
||||
--- a/db/db_iter.cc
|
||||
+++ b/db/db_iter.cc
|
||||
@@ -13,6 +13,7 @@
|
||||
#include "util/logging.h"
|
||||
#include "util/mutexlock.h"
|
||||
#include "util/random.h"
|
||||
+#include <sys/types.h> // for ssize_t
|
||||
|
||||
namespace leveldb {
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
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: 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 | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 07a5a1ead6fd..c87023db527a 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -412,3 +412,17 @@ $(SHARED_OUTDIR)/%.o: %.cc
|
||||
|
||||
$(SHARED_OUTDIR)/%.o: %.c
|
||||
$(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@
|
||||
+
|
||||
+INSTALL_ROOT = /
|
||||
+INSTALL_PREFIX= usr/local
|
||||
+
|
||||
+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
|
||||
+ 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
|
||||
|
||||
16
bsp/buildroot-2017.02.11/package/leveldb/Config.in
Normal file
16
bsp/buildroot-2017.02.11/package/leveldb/Config.in
Normal file
@@ -0,0 +1,16 @@
|
||||
config BR2_PACKAGE_LEVELDB
|
||||
bool "leveldb"
|
||||
# Missing/broken atomic pointer support
|
||||
depends on !BR2_bfin
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_SNAPPY
|
||||
help
|
||||
LevelDB is a fast key-value storage library written at Google that
|
||||
provides an ordered mapping from string keys to string values.
|
||||
|
||||
https://github.com/google/leveldb
|
||||
|
||||
comment "leveldb needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_bfin
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
2
bsp/buildroot-2017.02.11/package/leveldb/leveldb.hash
Normal file
2
bsp/buildroot-2017.02.11/package/leveldb/leveldb.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 7d7a14ae825e66aabeb156c1c3fae9f9a76d640ef6b40ede74cc73da937e5202 leveldb-v1.19.tar.gz
|
||||
36
bsp/buildroot-2017.02.11/package/leveldb/leveldb.mk
Normal file
36
bsp/buildroot-2017.02.11/package/leveldb/leveldb.mk
Normal file
@@ -0,0 +1,36 @@
|
||||
################################################################################
|
||||
#
|
||||
# leveldb
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LEVELDB_VERSION = v1.19
|
||||
LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION))
|
||||
LEVELDB_LICENSE = BSD-3c
|
||||
LEVELDB_LICENSE_FILES = LICENSE
|
||||
LEVELDB_INSTALL_STAGING = YES
|
||||
LEVELDB_DEPENDENCIES = snappy
|
||||
|
||||
# Disable the shared library for static only build
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LEVELDB_MAKE_ARGS += SHARED_LIBS= SHARED_PROGRAMS=
|
||||
endif
|
||||
|
||||
define LEVELDB_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
|
||||
$(LEVELDB_MAKE_ARGS) -C $(@D)
|
||||
endef
|
||||
|
||||
define LEVELDB_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
INSTALL_ROOT=$(STAGING_DIR) INSTALL_PREFIX=/usr \
|
||||
$(LEVELDB_MAKE_ARGS) -C $(@D) install
|
||||
endef
|
||||
|
||||
define LEVELDB_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
INSTALL_ROOT=$(TARGET_DIR) INSTALL_PREFIX=/usr \
|
||||
$(LEVELDB_MAKE_ARGS) -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user