All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v6] leveldb: new package
@ 2015-01-13 10:53 Steve James
  2015-02-02 16:14 ` Yann E. MORIN
  2015-04-05 14:34 ` Thomas Petazzoni
  0 siblings, 2 replies; 4+ messages in thread
From: Steve James @ 2015-01-13 10:53 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Steve James <ste@junkomatic.net>
---
Changes v5 -> v6:
  - Separated & simplified upstream patches
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 +++++++++
 package/leveldb/002-add-install-recipe.patch       | 38 +++++++++++++++++++
 .../leveldb/003-allow-flags-from-environment.patch | 34 +++++++++++++++++
 package/leveldb/Config.in                          | 13 +++++++
 package/leveldb/leveldb.mk                         | 44 ++++++++++++++++++++++
 6 files changed, 147 insertions(+)
 create mode 100644 package/leveldb/001-ssize_t-undefined.patch
 create mode 100644 package/leveldb/002-add-install-recipe.patch
 create mode 100644 package/leveldb/003-allow-flags-from-environment.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 <ste@junkomatic.net>
+
+--- 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 <sys/types.h> // for ssize_t
+ 
+ namespace leveldb {
+ 
diff --git a/package/leveldb/002-add-install-recipe.patch b/package/leveldb/002-add-install-recipe.patch
new file mode 100644
index 0000000..203f5bd
--- /dev/null
+++ b/package/leveldb/002-add-install-recipe.patch
@@ -0,0 +1,38 @@
+From 023bb673aad6b44f889ca9d96bc2eb32e4c6d6f8 Mon Sep 17 00:00:00 2001
+From: Steve James <ste@junkomatic.net>
+Date: Mon, 12 Jan 2015 13:32:24 +0000
+Subject: [PATCH 1/1] add install recipe
+
+Signed-off-by: Steve James <ste@junkomatic.net>
+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
++	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
+-- 
+1.9.1
+
diff --git a/package/leveldb/003-allow-flags-from-environment.patch b/package/leveldb/003-allow-flags-from-environment.patch
new file mode 100644
index 0000000..d1914f0
--- /dev/null
+++ b/package/leveldb/003-allow-flags-from-environment.patch
@@ -0,0 +1,34 @@
+From bca474961da4f102ef1d8b817b856808c9453a9e Mon Sep 17 00:00:00 2001
+From: Steve James <ste@junkomatic.net>
+Date: Mon, 12 Jan 2015 14:04:44 +0000
+Subject: [PATCH 1/1] allow flags from environment
+
+Signed-off-by: Steve James <ste@junkomatic.net>
+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)
++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)
+-- 
+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..3c03515
--- /dev/null
+++ b/package/leveldb/leveldb.mk
@@ -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=
+
+# 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
+
+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) \
+		INSTALL_ROOT=$(STAGING_DIR) INSTALL_PREFIX=/usr \
+		$(LEVELDB_MAKE_ARGS) -C $(@D) install
+endef
+
+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
+
+$(eval $(generic-package))
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v6] leveldb: new package
  2015-01-13 10:53 [Buildroot] [PATCH v6] leveldb: new package Steve James
@ 2015-02-02 16:14 ` Yann E. MORIN
  2015-02-03  9:59   ` Thomas Petazzoni
  2015-04-05 14:34 ` Thomas Petazzoni
  1 sibling, 1 reply; 4+ messages in thread
From: Yann E. MORIN @ 2015-02-02 16:14 UTC (permalink / raw)
  To: buildroot

Steve, All,

On 2015-01-13 10:53 +0000, Steve James spake thusly:
> Signed-off-by: Steve James <ste@junkomatic.net>
[--SNIP--]
> diff --git a/package/leveldb/002-add-install-recipe.patch b/package/leveldb/002-add-install-recipe.patch
> new file mode 100644
> index 0000000..203f5bd
> --- /dev/null
> +++ b/package/leveldb/002-add-install-recipe.patch
> @@ -0,0 +1,38 @@
> +From 023bb673aad6b44f889ca9d96bc2eb32e4c6d6f8 Mon Sep 17 00:00:00 2001
> +From: Steve James <ste@junkomatic.net>
> +Date: Mon, 12 Jan 2015 13:32:24 +0000
> +Subject: [PATCH 1/1] add install recipe
> +
> +Signed-off-by: Steve James <ste@junkomatic.net>
> +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
> ++	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

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

(to be adapted to the real file names, of course))

> diff --git a/package/leveldb/003-allow-flags-from-environment.patch b/package/leveldb/003-allow-flags-from-environment.patch
> new file mode 100644
> index 0000000..d1914f0
> --- /dev/null
> +++ b/package/leveldb/003-allow-flags-from-environment.patch
> @@ -0,0 +1,34 @@
> +From bca474961da4f102ef1d8b817b856808c9453a9e Mon Sep 17 00:00:00 2001
> +From: Steve James <ste@junkomatic.net>
> +Date: Mon, 12 Jan 2015 14:04:44 +0000
> +Subject: [PATCH 1/1] allow flags from environment
> +
> +Signed-off-by: Steve James <ste@junkomatic.net>
> +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)
> ++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)

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.

To be tested and confirmed, of course.

> diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk
> new file mode 100644
> index 0000000..3c03515
> --- /dev/null
> +++ b/package/leveldb/leveldb.mk
> @@ -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=
> +
> +# 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

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

Here switch the order of TARGET_CONFIGURE_OPTS, like explained above.

> +define LEVELDB_INSTALL_STAGING_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
> +		INSTALL_ROOT=$(STAGING_DIR) INSTALL_PREFIX=/usr \
> +		$(LEVELDB_MAKE_ARGS) -C $(@D) install
> +endef
> +
> +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.

Regards,
Yann E. MORIN.

> +$(eval $(generic-package))
> -- 
> 1.9.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v6] leveldb: new package
  2015-02-02 16:14 ` Yann E. MORIN
@ 2015-02-03  9:59   ` Thomas Petazzoni
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2015-02-03  9:59 UTC (permalink / raw)
  To: buildroot

Dear Yann E. MORIN,

On Mon, 2 Feb 2015 17:14:08 +0100, Yann E. MORIN wrote:

> 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

Well, I actually asked Steve to write patches that can be submitted
upstream (leveldb upstream is active) rather than solving all problems
in the Buildroot .mk file.


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

Aaah, yes, indeed. When passed in the environment, a normal += work,
and you don't need the override.


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

Well I actually asked for the opposite, in order to use positive logic,
i.e test BR2_SHARED_LIBS==y.

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

Or not, depending on whether we want the patch to be upstreamed.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v6] leveldb: new package
  2015-01-13 10:53 [Buildroot] [PATCH v6] leveldb: new package Steve James
  2015-02-02 16:14 ` Yann E. MORIN
@ 2015-04-05 14:34 ` Thomas Petazzoni
  1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2015-04-05 14:34 UTC (permalink / raw)
  To: buildroot

Dear Steve James,

On Tue, 13 Jan 2015 10:53:57 +0000, Steve James wrote:
> Signed-off-by: Steve James <ste@junkomatic.net>

Applied, thanks, after doing some small changes:

    [Thomas:
      - remove 003-allow-flags-from-environment.patch, and pass
        TARGET_CONFIGURE_OPTS in the environment instead.
      - convert the patches to Git formatted patches.
      - use the v1.18 tag instead of a commit hash.
      - do not pass TARGET_CONFIGURE_OPTS at install time, this is not
        needed.]

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-04-05 14:34 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-13 10:53 [Buildroot] [PATCH v6] leveldb: new package Steve James
2015-02-02 16:14 ` Yann E. MORIN
2015-02-03  9:59   ` Thomas Petazzoni
2015-04-05 14:34 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.