From patchwork Fri Jan 9 17:09:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve James X-Patchwork-Id: 427182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 7FA9C140077 for ; Sat, 10 Jan 2015 04:11:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A41678BDAE; Fri, 9 Jan 2015 17:11:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9AOOgJlWzTgN; Fri, 9 Jan 2015 17:11:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1A5CA8BD24; Fri, 9 Jan 2015 17:11:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id ACA7B1C226A for ; Fri, 9 Jan 2015 17:11:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A6A6532CAE for ; Fri, 9 Jan 2015 17:11:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L41SfGw6WCQO for ; Fri, 9 Jan 2015 17:10:59 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from teletype.junkomatic.net (teletype.junkomatic.net [167.88.41.243]) by silver.osuosl.org (Postfix) with ESMTPS id 41C231FEC9 for ; Fri, 9 Jan 2015 17:10:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=junkomatic.net; s=d4783bb0; h=Message-Id:Date:Subject:Cc:To:From; bh=bK7sPkLel8dky418JDxAVmkmqegCBqrEP8rU8bW6miY=; b=aKDgfUqge5QhEL3HFri64eLb0sBt3DWmM7PsYSxMDxRJ5Iv+zdZLZpNLPHHaVmCKH9qjAksxEJIkX8oqy3AxqcqkC7NION76lBaqLyCgvIm7U0siaxyfVog7ReivPpoCDgBPJ/ImccZTib82CQSZGgktrXARn3QfJCP6Ey3qoPg=; Received: from [87.82.216.58] (helo=uk01-31r76x1.CAMNWK.COM) by teletype.junkomatic.net with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1Y9d5I-00071u-4Z; Fri, 09 Jan 2015 17:10:52 +0000 From: Steve James To: buildroot@buildroot.org Date: Fri, 9 Jan 2015 17:09:46 +0000 Message-Id: <1420823386-18874-1-git-send-email-ste@junkomatic.net> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH v5] leveldb: new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Steve James --- Changes v4 -> v5: - Simplify our make by patching Buildroot support into upstream Changes v3 -> v4: - Don't damage global scope make macros - Add dependency on threads toolchain Changes v2 -> v3: - Re-submit without line wrapping Changes v1 -> v2: - Upstream release labels don't include package name, giving us an anonymous download archive, so use $(call github) method instead - Use $(TARGET_CONFIGURE_OPTS) - Support new shared vs static vs shared+static possibilities package/Config.in | 1 + package/leveldb/001-ssize_t-undefined.patch | 17 +++++ ...002-facilitate-integration-into-buildroot.patch | 78 ++++++++++++++++++++++ package/leveldb/Config.in | 13 ++++ package/leveldb/leveldb.mk | 46 +++++++++++++ 5 files changed, 155 insertions(+) create mode 100644 package/leveldb/001-ssize_t-undefined.patch create mode 100644 package/leveldb/002-facilitate-integration-into-buildroot.patch create mode 100644 package/leveldb/Config.in create mode 100644 package/leveldb/leveldb.mk diff --git a/package/Config.in b/package/Config.in index 90d334c..e9f2255 100644 --- a/package/Config.in +++ b/package/Config.in @@ -631,6 +631,7 @@ menu "Database" source "package/berkeleydb/Config.in" source "package/cppdb/Config.in" source "package/gdbm/Config.in" + source "package/leveldb/Config.in" source "package/mysql/Config.in" source "package/postgresql/Config.in" source "package/redis/Config.in" diff --git a/package/leveldb/001-ssize_t-undefined.patch b/package/leveldb/001-ssize_t-undefined.patch new file mode 100644 index 0000000..9a958d8 --- /dev/null +++ b/package/leveldb/001-ssize_t-undefined.patch @@ -0,0 +1,17 @@ +Fix leveldb issue 233 leveldb does not compile 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 + +--- a/db/db_iter.cc.orig 2014-12-08 16:54:31.384615752 +0000 ++++ b/db/db_iter.cc 2014-12-08 16:54:35.464656890 +0000 +@@ -13,6 +13,7 @@ + #include "util/logging.h" + #include "util/mutexlock.h" + #include "util/random.h" ++#include // for ssize_t + + namespace leveldb { + diff --git a/package/leveldb/002-facilitate-integration-into-buildroot.patch b/package/leveldb/002-facilitate-integration-into-buildroot.patch new file mode 100644 index 0000000..c256f34 --- /dev/null +++ b/package/leveldb/002-facilitate-integration-into-buildroot.patch @@ -0,0 +1,78 @@ +From 83d4b0db22f661718e9568e8bcde549ad3fd4222 Mon Sep 17 00:00:00 2001 +From: Steve James +Date: Fri, 9 Jan 2015 10:38:21 +0000 +Subject: [PATCH 1/1] facilitate integration into Buildroot: + - Add Buildroot TARGET_OS + - Allow flags from the environment + - Add install recipe + +Signed-off-by: Steve James +Upstream-Status: Submitted [https://github.com/google/leveldb/pull/274] +--- + Makefile | 25 +++++++++++++++++++++---- + build_detect_platform | 8 ++++++++ + 2 files changed, 29 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 24f214a..130fd19 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,11 +20,11 @@ $(shell CC="$(CC)" CXX="$(CXX)" TARGET_OS="$(TARGET_OS)" \ + # this file is generated by the previous line to set build flags and sources + include build_config.mk + +-CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT) +-CXXFLAGS += -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) ++override CFLAGS += -I. -I./include $(PLATFORM_CCFLAGS) $(OPT) ++override CXXFLAGS += -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) + +-LDFLAGS += $(PLATFORM_LDFLAGS) +-LIBS += $(PLATFORM_LIBS) ++override LDFLAGS += $(PLATFORM_LDFLAGS) ++override LIBS += $(PLATFORM_LIBS) + + LIBOBJECTS = $(SOURCES:.cc=.o) + MEMENVOBJECTS = $(MEMENV_SOURCES:.cc=.o) +@@ -229,3 +229,20 @@ else + .c.o: + $(CC) $(CFLAGS) -c $< -o $@ + endif ++ ++INSTALL_ROOT = ++INSTALL_PREFIX= usr ++ ++install: $(SHARED) $(LIBRARY) ++ 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 ++ +diff --git a/build_detect_platform b/build_detect_platform +index bb76c4f..0ad4f8d 100755 +--- a/build_detect_platform ++++ b/build_detect_platform +@@ -147,6 +147,14 @@ case "$TARGET_OS" in + PLATFORM_SHARED_CFLAGS= + PLATFORM_SHARED_VERSIONED= + ;; ++ Buildroot) ++ PLATFORM=OS_LINUX ++ COMMON_FLAGS="$MEMCMP_FLAG -pthread -DOS_LINUX -DLEVELDB_PLATFORM_POSIX -DLEVELDB_ATOMIC_PRESENT" ++ PLATFORM_LDFLAGS="-pthread" ++ PLATFORM_CXXFLAGS="-std=c++0x" ++ PORT_FILE=port/port_posix.cc ++ CROSS_COMPILE=true ++ ;; + *) + echo "Unknown platform!" >&2 + exit 1 +-- +1.9.1 + diff --git a/package/leveldb/Config.in b/package/leveldb/Config.in new file mode 100644 index 0000000..af097e5 --- /dev/null +++ b/package/leveldb/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_LEVELDB + bool "leveldb" + 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_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk new file mode 100644 index 0000000..ffbcc3e --- /dev/null +++ b/package/leveldb/leveldb.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# leveldb +# +################################################################################ + +LEVELDB_VERSION = 803d69203a62faf50f1b77897310a3a1fcae712b +LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION)) +LEVELDB_LICENSE = BSD-3c +LEVELDB_LICENSE_FILES = LICENSE +LEVELDB_INSTALL_STAGING = YES +LEVELDB_DEPENDENCIES = snappy + +LEVELDB_MAKE_ARGS += TARGET_OS=Buildroot + +# We will pass optimisation level via CFLAGS so remove leveldb default +LEVELDB_MAKE_ARGS += OPTIM= + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),) +# Dynamic library not required +LEVELDB_MAKE_ARGS += SHARED= +endif + +ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),) +# Static library not required +LEVELDB_MAKE_ARGS += LIBRARY= +endif + +define LEVELDB_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(LEVELDB_MAKE_ARGS) -C $(@D) +endef + +define LEVELDB_INSTALL_STAGING_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(LEVELDB_MAKE_ARGS) -C $(@D) INSTALL_ROOT=$(STAGING_DIR) install +endef + +ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) +define LEVELDB_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + $(LEVELDB_MAKE_ARGS) -C $(@D) INSTALL_ROOT=$(TARGET_DIR) install +endef +endif + +$(eval $(generic-package))