leveldb: new package

Signed-off-by Steve James <[email protected]>

package/leveldb/002-add-install-recipe.patch new file +25 -0

new file mode 100644
index 0000000..203f5bd
@@ -0,0 +1,38 @@
+From 023bb673aad6b44f889ca9d96bc2eb32e4c6d6f8 Mon Sep 17 00:00:00 2001
+From: Steve James <[email protected]>
+Date: Mon, 12 Jan 2015 13:32:24 +0000
+Subject: [PATCH 1/1] add install recipe
+
+Signed-off-by: Steve James <[email protected]>
+Upstream-Status: Submitted [https://github.com/google/leveldb/pull/276]
+---
+ Makefile | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 24f214a..8f68ca8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -229,3 +229,19 @@ else
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $< -o $@
+ endif
++
++INSTALL_ROOT = /
++INSTALL_PREFIX= usr/local
++
++install: $(SHARED) $(LIBRARY)
++	install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb

package/leveldb/003-allow-flags-from-environment.patch new file +21 -0

new file mode 100644
index 0000000..d1914f0
@@ -0,0 +1,34 @@
+From bca474961da4f102ef1d8b817b856808c9453a9e Mon Sep 17 00:00:00 2001
+From: Steve James <[email protected]>
+Date: Mon, 12 Jan 2015 14:04:44 +0000
+Subject: [PATCH 1/1] allow flags from environment
+
+Signed-off-by: Steve James <[email protected]>
+Upstream-Status: Submitted [https://github.com/google/leveldb/pull/277]
+---
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 24f214a..43ece67 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)

package/leveldb/leveldb.mk new file +15 -0

new file mode 100644
index 0000000..3c03515
@@ -0,0 +1,44 @@
+################################################################################
+#
+# 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
+
+# We will pass optimisation level via CFLAGS so remove leveldb default
+LEVELDB_MAKE_ARGS += OPTIM=

package/leveldb/leveldb.mk new file +1 -0

+$(eval $(generic-package))

Signature · 6 lines

1.9.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Rather than adding this in the package's Makefile, can't we just do the installation manually in the .mk file, that is, something like:

    ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
    define LEVELDB_INSTALL_STATIC
        $(INSTALL) -D -m 0644 $(@D)/lib/libleveldb.a $(1)/usr/lib/libleveldb.a
    endef
    endif
    ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
    define LEVELDB_INSTALL_SHARED
        $(INSTALL) -D -m 0644 $(@D)/lib/libleveldb.so $(1)/usr/lib/libleveldb.so
        ln -sf libleveldb.so $(1)/usr/lib/libleveldb.so.VERSION
    endef
    endif

    define LEVELDB_INSTALL_STAGING_CMDS

        $(call LEVELDB_INSTALL_STATIC,$(STAGING_DIR))
        $(call LEVELDB_INSTALL_SHARED,$(STAGING_DIR))
        install -D -m 0644 $(@D)/leveldb.h $(STAGING_DIR)/usr/include/leveldb.h
    endef

    define LEVELDB_INSTALL_TARGET_CMDS
        $(call LEVELDB_INSTALL_SHARED,$(STAGING_DIR))
    endef

Quoted 7 lines

+-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)

Quoted 5 lines

++override LDFLAGS += $(PLATFORM_LDFLAGS)
++override LIBS += $(PLATFORM_LIBS)
+
+ LIBOBJECTS = $(SOURCES:.cc=.o)
+ MEMENVOBJECTS = $(MEMENV_SOURCES:.cc=.o)

I think this would not be needed if you do:

    define LEVELDB_BUILD_CMDS
        $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
            $(LEVELDB_MAKE_ARGS) -C $(@D)
    endef

i.e. pass the TARGET_CONFIGURE_OPTS in the environment, and not as make arguments.

package/leveldb/leveldb.mk line 25

Quoted 9 lines

package/leveldb/leveldb.mk new file +9 -0

+# 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=
+endif

I would prefer we actually we use direct logic, like:

    ifeq ($(BR2_STATIC_LIBS),)
    LEVELDB_MAKE_ARGS += SHARED=
    endif

    ifeq ($(BR2_SHARED_LIBS),)
    LEVELDB_MAKE_ARGS += LIBRARY=
    endif

package/leveldb/leveldb.mk line 42

Quoted 5 lines

package/leveldb/leveldb.mk new file +5 -0

+define LEVELDB_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		INSTALL_ROOT=$(TARGET_DIR) INSTALL_PREFIX=/usr \
+		$(LEVELDB_MAKE_ARGS) -C $(@D) install
+endef

And adapt the install commands as explained above.

Signed-off-by Steve James <[email protected]>