All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/2] package/leveldb: turn snappy into an optional dependency
Date: Tue, 26 May 2020 22:50:35 +0200	[thread overview]
Message-ID: <20200526205035.GF8737@scaer> (raw)
In-Reply-To: <20200518052203.1667697-1-thomas.petazzoni@bootlin.com>

Thomas, All,

On 2020-05-18 07:22 +0200, Thomas Petazzoni spake thusly:
> snappy is not a mandatory dependency to build leveldb. Back when it
> was introduced in Buildroot, as of version 1.18, the build logic
> already made snappy an optional dependency.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Both applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/leveldb/Config.in  | 1 -
>  package/leveldb/leveldb.mk | 5 ++++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/package/leveldb/Config.in b/package/leveldb/Config.in
> index c767b88645..c4279fcb64 100644
> --- a/package/leveldb/Config.in
> +++ b/package/leveldb/Config.in
> @@ -3,7 +3,6 @@ config BR2_PACKAGE_LEVELDB
>  	depends on BR2_INSTALL_LIBSTDCPP
>  	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
>  	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
> diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk
> index cf3c096f5d..684b618679 100644
> --- a/package/leveldb/leveldb.mk
> +++ b/package/leveldb/leveldb.mk
> @@ -9,9 +9,12 @@ LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION))
>  LEVELDB_LICENSE = BSD-3-Clause
>  LEVELDB_LICENSE_FILES = LICENSE
>  LEVELDB_INSTALL_STAGING = YES
> -LEVELDB_DEPENDENCIES = snappy
>  LEVELDB_CONF_OPTS = \
>  	-DLEVELDB_BUILD_BENCHMARKS=OFF \
>  	-DLEVELDB_BUILD_TESTS=OFF
>  
> +ifeq ($(BR2_PACKAGE_SNAPPY),y)
> +LEVELDB_DEPENDENCIES += snappy
> +endif
> +
>  $(eval $(cmake-package))
> -- 
> 2.26.2
> 
> _______________________________________________
> 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 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

  parent reply	other threads:[~2020-05-26 20:50 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-18  5:22 [Buildroot] [PATCH 1/2] package/leveldb: turn snappy into an optional dependency Thomas Petazzoni
2020-05-18  5:22 ` [Buildroot] [PATCH 2/2] package/leveldb: fix detection of the snappy library Thomas Petazzoni
2020-06-01 20:04   ` Peter Korsgaard
2020-05-26 20:50 ` Yann E. MORIN [this message]
2020-06-01 20:04 ` [Buildroot] [PATCH 1/2] package/leveldb: turn snappy into an optional dependency Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200526205035.GF8737@scaer \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.