From patchwork Fri Jul 1 23:06:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 643325 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rhBsW0tnfz9s9Z for ; Sat, 2 Jul 2016 09:08:15 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=TT2nm9iX; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bJ7Wg-0007Cq-Dn; Fri, 01 Jul 2016 23:07:10 +0000 Received: from mail-pa0-x241.google.com ([2607:f8b0:400e:c03::241]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bJ7We-00076L-OF for lede-dev@lists.infradead.org; Fri, 01 Jul 2016 23:07:09 +0000 Received: by mail-pa0-x241.google.com with SMTP id ts6so10681838pac.0 for ; Fri, 01 Jul 2016 16:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DtTF44Y1dS1k0HXMVKgL3bTrKtNThCix8PhlRAl8E7s=; b=TT2nm9iXAzMzuy3QAVr9Oj2cGFT7rhopw6ti4MRvoANxSSow6xfPWyKpOFsdyK3BS1 EjwDzkzF9+uL7N2vBUybhT7nakTYLY+WSB6Ipg9r1/UZdpjDv65Y+byyuK83Y/+ASqvz i6WPxDyYAXTDVl+nq1xC40/Aw2KiAwb12pjCKSBcXO51EQzmcUY4MVVCxrWsYFX9/Ivs 95K2t6bOAUYNPNTO7hkbtdCbbMEIXWF3EiBLqd/FnAeXsWOIU4HRT1hUIf/Jvj8739rq n8+ZnvjREV9HMOyIQv742rL4KsKXe1xq2nheAGe7jU7dqombnzMefQSipCokXF+22S2J /SGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DtTF44Y1dS1k0HXMVKgL3bTrKtNThCix8PhlRAl8E7s=; b=ZEJnbeOJZcvukouKvh9Adu3cTYphJtIK/pbzfql6bXsOc2/WdJOCBSyeLRQCUEO/BP k//k8GY659xryKHXsu7IGqrOjBWkXl+B6HEqwPCOIOSAhfTTgzVIJ/OJ5RBlsZ7Bgqpt W7eazb+bQm1eXm6SVB17e+CIz9v/WGdqaJPJaYnNU45yq1auQdJmHdWUmInvBolTj5fw obLMnNbYNuDgaVv98Dshs7BpM67o54MNIHDHBSlZONgX8lncwjgrNxfv8HySRjhXukcF Q5xDLgPngoJqaznbE7eaIcTdTfht9KEyxpAYe1ESKSEMqwj1r3hqTRZg5JPQYUMKBv8z ZFzQ== X-Gm-Message-State: ALyK8tJkGjms18+9dy29tXO8alb/oOcYIpnV0aO3SkvnpIOtu19yTefCnNmP8UDLpxmVNw== X-Received: by 10.66.162.3 with SMTP id xw3mr1201449pab.82.1467414408321; Fri, 01 Jul 2016 16:06:48 -0700 (PDT) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id d69sm140539pfj.31.2016.07.01.16.06.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Jul 2016 16:06:47 -0700 (PDT) From: Florian Fainelli To: lede-dev@lists.infradead.org Date: Fri, 1 Jul 2016 16:06:42 -0700 Message-Id: <1467414402-15463-2-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467414402-15463-1-git-send-email-f.fainelli@gmail.com> References: <1467414402-15463-1-git-send-email-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160701_160708_832326_1640BE98 X-CRM114-Status: UNSURE ( 7.14 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400e:c03:0:0:0:241 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (f.fainelli[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [LEDE-DEV] [PATCH fstools 2/2] cmake: Link against libjson-c X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Fainelli , nbd@nbd.name MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org block uses libblob_msgjson which requires us to link against libjson-c. Some external toolchains would be failing to find that library unless specified explicitly. Signed-off-by: Florian Fainelli --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a5a583c46bf..7db28c0ab2ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,12 +53,14 @@ ADD_EXECUTABLE(mount_root mount_root.c) TARGET_LINK_LIBRARIES(mount_root fstools) INSTALL(TARGETS mount_root RUNTIME DESTINATION sbin) +find_library(json NAMES json-c json) + ADD_EXECUTABLE(block block.c) IF(DEFINED CMAKE_UBIFS_EXTROOT) ADD_DEFINITIONS(-DUBIFS_EXTROOT) - TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ubi-utils) + TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ubi-utils ${json}) ELSE(DEFINED CMAKE_UBIFS_EXTROOT) - TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json) + TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ${json}) ENDIF(DEFINED CMAKE_UBIFS_EXTROOT) INSTALL(TARGETS block RUNTIME DESTINATION sbin)