From patchwork Thu Sep 8 12:26:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 667542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sVKMM0yQ2z9ryT for ; Thu, 8 Sep 2016 22:26:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id CBE99C0C58; Thu, 8 Sep 2016 12:26:36 +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 8Eh1gk2voFdH; Thu, 8 Sep 2016 12:26:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 30AAF88A28; Thu, 8 Sep 2016 12:26:35 +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 A745C1C290C for ; Thu, 8 Sep 2016 12:26:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id A52B18C67F for ; Thu, 8 Sep 2016 12:26:33 +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 LcJSv96pu-o2 for ; Thu, 8 Sep 2016 12:26:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id C70BB8BC4C for ; Thu, 8 Sep 2016 12:26:30 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 5E9C8440A82; Thu, 8 Sep 2016 15:26:26 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Thu, 8 Sep 2016 15:26:16 +0300 Message-Id: <6e8b8eed2c6651f1756e527ad6b73a6aaa5f5175.1473337577.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.9.3 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/2] leveldb: fix static build 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" Since version 1.19 Makefile variable names changed. Update the build command accordingly. While at it, remove variables that Makefile doesn't use anymore. This change means that the static library is always build, even when BR2_SHARED_LIBS=y, since the static library name is hard coded in leveldb Makefile. Fixes: http://autobuild.buildroot.net/results/00c/00c8c5a1d6001eaebfe2a9f848dd292c91bf6a79/ Cc: Bernd Kuhls Signed-off-by: Baruch Siach --- package/leveldb/leveldb.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk index 2ce3e4ace4ed..ca2ed703a0bd 100644 --- a/package/leveldb/leveldb.mk +++ b/package/leveldb/leveldb.mk @@ -11,17 +11,9 @@ 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= +LEVELDB_MAKE_ARGS += SHARED_LIBS= SHARED_PROGRAMS= endif define LEVELDB_BUILD_CMDS