From patchwork Wed Nov 12 13:59:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yousong Zhou X-Patchwork-Id: 419612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EDA311400A0 for ; Wed, 10 Dec 2014 23:18:09 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8B13828C1C7; Wed, 10 Dec 2014 13:15:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-0.3 required=5.0 tests=BAYES_00, DATE_IN_PAST_96_XX, FREEMAIL_FROM,T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4580828C11B for ; Wed, 10 Dec 2014 13:15:48 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 10 Dec 2014 13:15:47 +0100 (CET) Received: by mail-pa0-f54.google.com with SMTP id fb1so2725412pad.27 for ; Wed, 10 Dec 2014 04:17:31 -0800 (PST) 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=OPz1Bb0qK0gIImFdUetSj86Ci6ibkAbfMiV/Ukt15l4=; b=ijJ6x3TTtFmOhCBWLLOyBh3aBAfBjW2IgChI6DdQzW30+8nxlJxc9jKTmCmPNxs0Si qptIzdjhJUJY6kSclj0KFpNkUmgQ9PYBFrTn8eiez9ymvKHwxjQtaL5ELYQxEfyu3CUD Gt651rA9nhy1oUNe+ayUjDTrRe1KqEmlXgaQG7ff/Kj4NxIqAzlOsPc7kTht9I0svC2O 9cMod3acx8OqFUpDO4YLWk/C/2iOdb82W0NBC7H0uH3jA3CLKrzUVP3g9dyC5TvOozbv UwWiqWfUPTd7OC7K8FeLIgRaCnbavJgoMXKSss9HFhGAK0Y6SAgocIG1VfUWn+bQacbN X5YA== X-Received: by 10.66.235.165 with SMTP id un5mr6317034pac.109.1418213850377; Wed, 10 Dec 2014 04:17:30 -0800 (PST) Received: from debian.lan ([103.29.140.56]) by mx.google.com with ESMTPSA id hc10sm4063709pbd.78.2014.12.10.04.17.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Dec 2014 04:17:28 -0800 (PST) From: Yousong Zhou To: nbd@openwrt.org Date: Wed, 12 Nov 2014 21:59:14 +0800 Message-Id: <1415800763-14311-2-git-send-email-yszhou4tech@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1415800763-14311-1-git-send-email-yszhou4tech@gmail.com> References: <1415800763-14311-1-git-send-email-yszhou4tech@gmail.com> Cc: Peter Korsgaard , openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH v2 01/10] libubox: drop legacy json-c support X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all modules are found), and the legacy libjson.so name is also used by the other libjson (http://sourceforge.net/projects/libjson/) which provides an incompatible API, so just drop it. Signed-off-by: Peter Korsgaard Signed-off-by: Yousong Zhou --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f24fee9..737f2ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ IF(APPLE) ENDIF() INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(JSONC json-c json) +PKG_CHECK_MODULES(JSONC json-c) IF(JSONC_FOUND) ADD_DEFINITIONS(-DJSONC) INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS}) @@ -45,7 +45,7 @@ INSTALL(TARGETS ubox ubox-static ADD_SUBDIRECTORY(lua) -find_library(json NAMES json-c json) +find_library(json NAMES json-c) IF(EXISTS ${json}) ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c) TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json})