From patchwork Wed Feb 3 12:43:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 1435256 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; 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=l214xB7L; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DW1Zj2rcyz9tlJ for ; Wed, 3 Feb 2021 23:43:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8CBBE204F3; Wed, 3 Feb 2021 12:43: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 K6DaYVsK8sDL; Wed, 3 Feb 2021 12:43:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2E5A3207A8; Wed, 3 Feb 2021 12:43:44 +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 85C2F1BF5AD for ; Wed, 3 Feb 2021 12:43:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 82728815E3 for ; Wed, 3 Feb 2021 12:43:42 +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 TKZNB5134yAj for ; Wed, 3 Feb 2021 12:43:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id AC4B48141A for ; Wed, 3 Feb 2021 12:43:41 +0000 (UTC) Received: by mail-ej1-f52.google.com with SMTP id sa23so19209291ejb.0 for ; Wed, 03 Feb 2021 04:43:41 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=mk4xm/yFA3TKSLyreO2jKeIEsnrg7Vdj67X2G3AEQMw=; b=l214xB7L+XxIcL1DQNAA9AkM24mgFk/TCqJw3ImTraF9cqJY0i/k0MU32aiCB/cdor We6OJKfZgkqrJtRliRABkWZk9v1A0/FnfVnLak1M1geqJBRcy+re4j6aB6RHTS9jS1l3 0meNBVcngvOrMjNjif9630rnot1kqeHC83XUMOyNC3t9Z4aCNHz6AnRvCadnfG9pGNmO QprKNza3bx0T7g395bHLqV82UVTBlWN7VivPDH2j//rB6E6eQEqK88KllHZDhiTrQNAx 1vMx46LwpfFWTsJuuAjKa3m5qYpyA6IXNpgv4WIGq4/i+eGrFb9nytSpg6qccQrvUdRW O7FA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=mk4xm/yFA3TKSLyreO2jKeIEsnrg7Vdj67X2G3AEQMw=; b=p3doE2hHKfo1wFLg2KjzsTtmf/0dKojH7Y1Kf20fet1qmeUQ2TK74zQZcxtTFK/eMp MtXdQCVle8855tkV8xxVON9jE7bmPQQqhqZWVSUoLVnB89aOAG3p0IBofaGqdodTiD4M HyAIMhWXg15I0uWseuuZmQchd6kzrcOs6Nj/O7tFvdQRTqJZl/yMauVAzazl4ia72i2g TfyU0xgCliYoGQfxxD6ExIQkjV1y1nV3+CPiM+00sGtm/1gf4T0J8BLvT+XpZP1/U/7p /jPdWW97TYN0ioQ4uxYIhAp/PpTJBWmTe7aX1lodHtL4Jl0qsk4tb2u78uoUn5KTBL2M pC6g== X-Gm-Message-State: AOAM530g98rDbMfE9WwSne2xj04xwhvbGK9eqP2g27JsRI4qbOzlwfpL ZQATN2xw/FjJoRJIX7TTKUzc4TFO56H5AR0t X-Google-Smtp-Source: ABdhPJwkW/+BYwQd3gdWn1jJMTbk2GkdRGH69DOad2OIaypNNR0n1pfY/6Qw4TtDjnC0RLq53oRyUg== X-Received: by 2002:a17:906:73c2:: with SMTP id n2mr3084139ejl.224.1612356220067; Wed, 03 Feb 2021 04:43:40 -0800 (PST) Received: from localhost (ptr-5gw9txf6g5tndjqqqz.18120a2.ip6.access.telenet.be. [2a02:1810:510:3800:1b15:18e4:57d1:eb]) by smtp.gmail.com with ESMTPSA id r26sm858682edc.95.2021.02.03.04.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 04:43:39 -0800 (PST) From: Thomas De Schampheleire To: buildroot@buildroot.org Date: Wed, 3 Feb 2021 13:43:22 +0100 Message-Id: <20210203124325.18843-2-patrickdepinguin@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210203124325.18843-1-patrickdepinguin@gmail.com> References: <20210203124325.18843-1-patrickdepinguin@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/3] package/collectd: stop passing '--with-libgrpc++' X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , Asaf Kahlon , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Thomas De Schampheleire Commit 903de16f5fd586a32a7aed7a792a43dce16365eb added passing '--with-libgrpc++' with the explanation: "Use --with-libgrpc++ option as otherwise collectd will try to find grpc++.pc which is not available." At the time of above commit, grpc version in Buildroot was 1.23.0. Since grpc 1.25.0, a grpc++.pc file _is_ generated from cmake builds. Hence, remove passing --with-libgrpc++. This change fixes a problem introduced by commit fedf3318e3fd3c9ba57389ed2b36472f1a772b9e. As a side effect of that change, a target version of 'grpc_cpp_plugin' was now created. When collectd was built after grpc, even without grpc support in collectd enabled, the collectd configure script would find this target grpc_cpp_plugin and try to use it (which is not possible because it is built for target). When not passing '--with-libgrpc++', collectd will instead find the host version of grpc_cpp_plugin, which works fine. There are still two underlying problems: 1. the target version of grpc_cpp_plugin is not actually needed. This will be disabled in a subsequent commit. 2. collectd should not execute any grpc-related action if grpc support for collectd is disabled. This problem has been reported upstream: https://github.com/collectd/collectd/issues/3836 Signed-off-by: Thomas De Schampheleire --- package/collectd/collectd.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index ccca9bf388..3fcca12a45 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -193,9 +193,6 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_WRITEREDIS),hiredis) # include/library fixups -ifeq ($(BR2_PACKAGE_GRPC),y) -COLLECTD_CONF_OPTS += --with-libgrpc++=$(STAGING_DIR)/usr -endif ifeq ($(BR2_PACKAGE_JANSSON),y) COLLECTD_CONF_OPTS += --with-libjansson=$(STAGING_DIR)/usr endif