From patchwork Mon May 18 05:22:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1292326 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49QS7h5yNRz9sT8 for ; Mon, 18 May 2020 15:22:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CC97786581; Mon, 18 May 2020 05:22:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NGdLoB0YR63X; Mon, 18 May 2020 05:22:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 31ED487726; Mon, 18 May 2020 05:22:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7F68C1BF3DE for ; Mon, 18 May 2020 05:22:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 768ED86581 for ; Mon, 18 May 2020 05:22:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SxYPtsXeWGZZ for ; Mon, 18 May 2020 05:22:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5E77A8763C for ; Mon, 18 May 2020 05:22:13 +0000 (UTC) X-Originating-IP: 86.210.146.109 Received: from localhost (lfbn-tou-1-915-109.w86-210.abo.wanadoo.fr [86.210.146.109]) (Authenticated sender: thomas.petazzoni@bootlin.com) by relay7-d.mail.gandi.net (Postfix) with ESMTPSA id E06F52000C; Mon, 18 May 2020 05:22:09 +0000 (UTC) From: Thomas Petazzoni To: buildroot@buildroot.org Date: Mon, 18 May 2020 07:22:01 +0200 Message-Id: <20200518052203.1667697-1-thomas.petazzoni@bootlin.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/leveldb: turn snappy into an optional dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: maksis33@gmail.com, Steve James , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- 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))