From patchwork Tue Jan 19 07:18:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Ponomarev X-Patchwork-Id: 1428484 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Rc6sLD+R; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VL0iqC3L; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKg5t3xdPz9sSs for ; Tue, 19 Jan 2021 18:20:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=pLvbDRxkm/CZ8pkxiphPbDn4sQ5KJbYxflD+omqL518=; b=Rc6sLD+RQo9J/lB+Ox7EJSSdWZ x8jy/mnY/Ef3yTtHC58Q+692gwNOW+YH08U18wijyPnlMwMjqzBHtA9FIWvYnwPnNE/6RUbXHlRoI GPWEEoNxSCeMUPUEKz4b7rZ2sriq42UXK0mszScYkQsy35ERfSY+MMo0BxGtyWSVOI5QG1H2wwTPy rzKq+NEvWBBEi2tXFVMXBSxj7BXwnNmO8kTcUz6/udl7qRB3A+9doO+nT2yUMFT2Q+5cSbnh9dFhm 3zUDjgQn0+M8AqDCIlYphqw5wT58T97wCD/lvcQbFfK+gFweNjGlHbZWf1d8lrtMCEVVD778teufQ Ol7uvCHQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1lHQ-0001cc-OC; Tue, 19 Jan 2021 07:18:20 +0000 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1lHO-0001ae-6M for openwrt-devel@lists.openwrt.org; Tue, 19 Jan 2021 07:18:19 +0000 Received: by mail-ej1-x631.google.com with SMTP id g3so7652690ejb.6 for ; Mon, 18 Jan 2021 23:18:10 -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:mime-version :content-transfer-encoding; bh=0IB3qCr4OVW0erONSNlpNsH23etyPj9LQnSU3AKwIoU=; b=VL0iqC3Lt+7xJejQQT7zevoyZylCIGxDq8AiTJLSs2FHvErMNC8xliFaxlARTnhxxS E6FJZL+dPVetlgkd81TbVhSxzzblAaSXBWOgeecYK0b+OItwqwfLaZnvQPh+UzTzOv2/ 58A63wiUXxIk08UJBRy1UWJtgOQGt1EGGCP1z3tJAFj3jocpRWZfcLbabAGPuAbl3aU5 koqryicOG7w3ZmUzEFI8TYIlD32XMg8BKVLLKJlbIJpXdISKBnH7oOHn/3OWC02WKhiu OWK8V7HN/YlIj10dAwpk+5Q80PVyaI55wcB3NkGYg1EIggXpWEOul4dOurD/iTNzEVCT agtg== 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:mime-version :content-transfer-encoding; bh=0IB3qCr4OVW0erONSNlpNsH23etyPj9LQnSU3AKwIoU=; b=alaEFd/ySoG9a2FTnq24cL0u5Sr69B4z9eY186ZgvqcIxX7pq2832uk7jYFu6j2x15 H3sOTBUQ+fLZDVNe6alRQBAklLKNpy8Ry1e279ZL+cBPMyQ3YYbYuecMZtn4jTgOXqMX qevt7P9C/9cceMLM9YB0zG4eIWBFZ4n+34vtz+zvs4lej07VJrPxjs9GzAYPMt+SKMZY RfnFjiLymXM4a6cmYTVWBPRYLwvVN/+7dPeJ3tqLcZRWOtau9kera8WGcB+bQeQmyLAw pRdFbj0s2bN0ti11XvLKujh29KG0MH0fljvgOKs+Q+oZVTD15htvKwQ/7UQis8Ec1bSX K3mw== X-Gm-Message-State: AOAM533lG/SobQtvKSHbD8n7vtP/gKTZYpM32aK/jT+UPYYsNZs+zwQI KBB1XdiFfFQnIAOGtBWU+1uZqpzUu9TRQw== X-Google-Smtp-Source: ABdhPJwi5+pjbo4uwSxHyeaodfH6tHh2jEU2mj0LKiaSJhd4MFPPW+vazIw3WXA31YMi1qj+Lhbq7g== X-Received: by 2002:a17:906:c045:: with SMTP id bm5mr2204102ejb.190.1611040688013; Mon, 18 Jan 2021 23:18:08 -0800 (PST) Received: from localhost.localdomain ([46.98.212.118]) by smtp.gmail.com with ESMTPSA id r18sm12369170edx.41.2021.01.18.23.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 23:18:07 -0800 (PST) From: Sergey Ponomarev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] rpcd CMakeLists.txt: drop legacy json-c support Date: Tue, 19 Jan 2021 09:18:04 +0200 Message-Id: <20210119071804.17969-1-stokito@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210119_021818_236415_6E50B5A3 X-CRM114-Status: GOOD ( 12.38 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [stokito[at]gmail.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:631 listed in] [list.dnswl.org] -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 -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sergey Ponomarev Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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. Backported from libubox cbf80de7f4df61960f386cb01a899cf4228d38f3 Signed-off-by: Sergey Ponomarev Reviewed-by: Rosen Penev --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26e011e..266dbe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ FIND_LIBRARY(uci NAMES uci) FIND_LIBRARY(ubus NAMES ubus) FIND_LIBRARY(ubox NAMES ubox) FIND_LIBRARY(blobmsg_json NAMES blobmsg_json) -FIND_LIBRARY(json NAMES json-c json) +FIND_LIBRARY(json NAMES json-c) FIND_LIBRARY(crypt NAMES crypt) IF(crypt STREQUAL "crypt-NOTFOUND") SET(crypt "")