From patchwork Tue Jan 19 07:15:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Ponomarev X-Patchwork-Id: 1428477 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=wo546oUc; 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=M4LU+5Cl; 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 4DKg2z2TFCz9sW8 for ; Tue, 19 Jan 2021 18:17:31 +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=BTfkqEckO9grtecLx+EDSjSBbMqJL2gWG8pZ0JcXwU4=; b=wo546oUcvbZOsiKn28LqiZki26 fI1rDnux9vFWIt3aJibtWjsmFEuEf0eS0jAUoRI4GtfXx8FY1AeeY//7/xDwVbp5WBjfWEreh6RD4 G//1P+H5gynj5q2jFQWDCgZyvE8JktkNv0q8mkL6DgsmWVzsOV2Ytf2UeFlhDxgWFM04Nz7FL6CVf IIKrcIQvZUA6y1RyYQtfpOQXfLvtv2t39lJjTKmCb3rfdvkTNcDClqEDj3db9WsAmRDEjfRUzindD TOTa1zsmTfg8aKYcIG9liLVabSXC3N1dnBegO04CMaUmIEbiR61aOTfnUfFin1/QHklETqd72j6T1 SX1mG2Jg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1lFC-0000v2-DJ; Tue, 19 Jan 2021 07:16:02 +0000 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1lFA-0000sv-Ar for openwrt-devel@lists.openwrt.org; Tue, 19 Jan 2021 07:16:01 +0000 Received: by mail-ed1-x536.google.com with SMTP id p22so20235433edu.11 for ; Mon, 18 Jan 2021 23:15:58 -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=L28kMpNGT7hzS0uH16UkOADKmX7f/NOvnxyfXrj3n/I=; b=M4LU+5ClkaQ1ZbmePCzyh7sb5xECn+1Bnymaxc4FAJXIuZDlOLmmOl5V45rsc6bSn3 9ajLbeR81wLi8RrmThGq8v8qqIQ2ZvWNTJVSob4HrsPrPbVDEPxA0IoMQ+QWwSm9YBvx sF4lZstmBWw9OBzFNklsImy7t7y46zuwGenBWx9Hoo8tg33FQ67gO+UuD3+N9ryRXk1U YQHEHtSDOw/cFTfVASCdgLZrNY/DzJ1f5Ha0pYnny54diVZSb1eh698Wnw2HRxfTaMCt 7mX2vj3fWGap2aulV/3LagejBmwf6s55EkqbVUe9Wb6Fac7O2edwVSQVjfafl3hC4r9m vziw== 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=L28kMpNGT7hzS0uH16UkOADKmX7f/NOvnxyfXrj3n/I=; b=YhyFcIkYKMwQzYQCIXFbtM7PlWKtc8jVxe/3j1VurHJdeuT0OXl3TQE2LOv4Iqk06h OvJathtauuM405YIlTD5wc7zRUqNmEb1txH6BxBvtQM7nur+I49gvU8Bw04zVqwzO2m5 K4WYeGXkV5FfxaszO3DmEra8dd15y32IGlUg4ckSwg+bbcEvhQ3ZWXYgmZ/lIdOqCoo4 GtKy0DnTlma/rfVYwCSZcFIDiq1QnR6Z6qJd4ek6mE+VzD9ysg/DTMPdwzq6rX/I4kaX J0VLmXwPPxevgTVJRuj6ViqstRZoZLAaV2gP7AnBCVbhYuMf+kYeCxzb1xBDVP0/MVnS 84LQ== X-Gm-Message-State: AOAM530Zyxkqo2BMB+ND+C6bhoI/hXsa5xh8JNf+a0KYEMvcqZ6S8/zz d9bWq5ibHCl6M/ttKIeMmkEUC1A/13lxvQ== X-Google-Smtp-Source: ABdhPJzGhGY/eb4hMaARHpeJ7AHjjewJTf+GSMfXr6iN/ZOBO5G7HwgyK+wK0eznqkmHL2qr1V3NkQ== X-Received: by 2002:a05:6402:1249:: with SMTP id l9mr2146153edw.375.1611040557152; Mon, 18 Jan 2021 23:15:57 -0800 (PST) Received: from localhost.localdomain ([46.98.212.118]) by smtp.gmail.com with ESMTPSA id w16sm9131203edv.4.2021.01.18.23.15.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jan 2021 23:15:56 -0800 (PST) From: Sergey Ponomarev To: openwrt-devel@lists.openwrt.org Subject: [PATCH] examples: drop legacy json-c support Date: Tue, 19 Jan 2021 09:15:53 +0200 Message-Id: <20210119071553.17488-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_021600_390122_AAA68593 X-CRM114-Status: GOOD ( 12.36 ) 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:536 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 cbf80de7f4df61960f386cb01a899cf4228d38f3 --- examples/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 04f18b0..1b71d06 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -7,7 +7,7 @@ IF (BUILD_EXAMPLES) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..) - FIND_LIBRARY(json NAMES json-c json) + FIND_LIBRARY(json NAMES json-c) ADD_EXECUTABLE(ustream-example ustream-example.c) TARGET_LINK_LIBRARIES(ustream-example ubox)