From patchwork Wed Mar 7 21:18:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 882797 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="G9Ef2PTB"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zxRN13rzCz9sgG for ; Thu, 8 Mar 2018 08:18:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C4F4D2E5A9; Wed, 7 Mar 2018 21:18:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jBDgiKtZhsPS; Wed, 7 Mar 2018 21:18:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B6BDD2E434; Wed, 7 Mar 2018 21:18:54 +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 63B9B1BFFEC for ; Wed, 7 Mar 2018 21:18:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9B733859CC for ; Wed, 7 Mar 2018 21:18:52 +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 Hzkh4o-Nczqh for ; Wed, 7 Mar 2018 21:18:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by whitealder.osuosl.org (Postfix) with ESMTPS id AA30588C83 for ; Wed, 7 Mar 2018 21:18:51 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id p104so3592409wrc.12 for ; Wed, 07 Mar 2018 13:18:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=i79ZLU7/R5aheSFXocH+01CFdRT9QcPTcCAvrhArL/I=; b=G9Ef2PTBd3zVLhtYzsOWML5uc8A3jz1K/0NBkLUASBMrxT19lERARwr6BsfWeUhzsJ Vt1opObATzPh/j17vYDhMsBwNApLXBWKJArIQI6LIpoTonDAKDK8WCK1DdYGnI3hD67L rk0gOvTdbonlnRyhT3NjpgLQVrOc1atNdEKolYir/A/4ZrxrcZX6UiZ54C61THm7Gllj ziBQIgEl67QWYw9AUffuY8wO+wlKTC5FE2YIoUO4eLpMqY30PClWqbDqiwVPCDU6U1Uw PvU2JnJUNusxOPow+efPUzqBFDHD4nxBpJTeQINjcyDJrMzKaaPFyZ7dfe2v8p5HJUhw Skgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=i79ZLU7/R5aheSFXocH+01CFdRT9QcPTcCAvrhArL/I=; b=tuRKLL/3pwUIVDqjHUp3o7a4qzlwuDhK9epIkufid037+7eG0BSr7ePVMvDsrZGMdZ uX9CbbUqzey3e1uJwH1RPX34s/tr8gLazXMH3wp5daVqUq+3gt6aRF9km6eoNEFmg8X1 fl3N2XBAS6zhF0UaYbX1zOoyWh1CgwbfVZiGf3ebRLC8eDD9RqXoVEk6TDsCQ4Ss385Z 80iaq/IMH6NU2sUqsVK0T2LB3qzCTTXQxyF3VjHGjQWvz2h99XONVhk4dNOgML3kHnt9 F+6h2ogz/WkeKheu8nnJ7b25qP0V0FVaAs2f2J7ROoTWAKdyT7K/rE1KCJfsc0G+EGKe 0geQ== X-Gm-Message-State: APf1xPB0gMwexFD+dEGxilOP4Pq6eOfw6cP2R+7Mj3FHwgALHMmkEZfe Nqek6OXIHDqtTvei6wayJFtcyw== X-Google-Smtp-Source: AG47ELtj0BNnq0ztabYCPUIrYw2mb+ZJ0ZVU98UmYGy949LdDiNBznAb2zXTIuKC4fd2zP/u3+nF7A== X-Received: by 10.223.200.144 with SMTP id k16mr21733443wrh.282.1520457529998; Wed, 07 Mar 2018 13:18:49 -0800 (PST) Received: from fabrice-VirtualBox.home (ARennes-656-1-229-26.w2-14.abo.wanadoo.fr. [2.14.45.26]) by smtp.gmail.com with ESMTPSA id p199sm3193635wmb.42.2018.03.07.13.18.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Mar 2018 13:18:49 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 7 Mar 2018 22:18:42 +0100 Message-Id: <20180307211842.27111-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH 1/1] jsoncpp: do not always build static library X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, static libray is always built as BUILD_STATIC_LIBS is ON by default so correctly set BUILD_STATIC_LIBS and BUILD_SHARED_LIBS depending on BR2_xxx_LIBS variables Signed-off-by: Fabrice Fontaine --- package/jsoncpp/jsoncpp.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/jsoncpp/jsoncpp.mk b/package/jsoncpp/jsoncpp.mk index 3a2ee087b3..eb471561f0 100644 --- a/package/jsoncpp/jsoncpp.mk +++ b/package/jsoncpp/jsoncpp.mk @@ -15,4 +15,12 @@ JSONCPP_CONF_OPTS += \ -DJSONCPP_WITH_TESTS=OFF \ -DJSONCPP_WITH_STRICT_ISO=OFF +ifeq ($(BR2_STATIC_LIBS),y) +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF +else ifeq ($(BR2_SHARED_STATIC_LIBS),y) +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON +else ifeq ($(BR2_SHARED_LIBS),y) +JSONCPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF -DBUILD_SHARED_LIBS=ON +endif + $(eval $(cmake-package))