From patchwork Tue Jul 14 12:39:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 74001 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 805A4A0540; Tue, 14 Jul 2020 14:43:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 170A11D539; Tue, 14 Jul 2020 14:43:41 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 5D4981D51F; Tue, 14 Jul 2020 14:43:39 +0200 (CEST) IronPort-SDR: e+zPtZk7p8ccT0WVmFD97Q4yyvFA40FT/QR5tgaiK/0Ubsq8YJweNl3BLV6ZxZJwnV9xapCdtu b4DHU5lEZxLA== X-IronPort-AV: E=McAfee;i="6000,8403,9681"; a="148018615" X-IronPort-AV: E=Sophos;i="5.75,350,1589266800"; d="scan'208";a="148018615" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jul 2020 05:43:38 -0700 IronPort-SDR: 6vOsXtZf/KABEoP3uWWh1wvlM6e4Ta4JSk54Z0vws+LUDdk6pQoD+NKDEBTkQg1AKAQLH+smpa xopx49/owgJQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,350,1589266800"; d="scan'208";a="324534338" Received: from silpixa00399953.ir.intel.com (HELO silpixa00399953.ger.corp.intel.com) ([10.237.222.53]) by FMSMGA003.fm.intel.com with ESMTP; 14 Jul 2020 05:43:36 -0700 From: Ciara Power To: dev@dpdk.org Cc: bruce.richardson@intel.com, Ciara Power , stable@dpdk.org Date: Tue, 14 Jul 2020 13:39:12 +0100 Message-Id: <20200714123912.61208-1-ciara.power@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] metrics: fix installation of metrics header X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If Jansson was found, the headers list is overwritten when including rte_metrics_telemetry.h, which prevents rte_metrics.h from being installed. This is now fixed to add to headers, rather than overwrite, to allow both headers be installed when Jansson is present. Fixes: c5b7197f662e ("telemetry: move some functions to metrics library") Cc: stable@dpdk.org Signed-off-by: Ciara Power Acked-by: David Marchand --- lib/librte_metrics/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.build index 27ccbd655..eed27b880 100644 --- a/lib/librte_metrics/meson.build +++ b/lib/librte_metrics/meson.build @@ -8,7 +8,7 @@ jansson = dependency('jansson', required: false) if jansson.found() ext_deps += jansson sources += files('rte_metrics_telemetry.c') - headers = files('rte_metrics_telemetry.h') + headers += files('rte_metrics_telemetry.h') deps += ['ethdev', 'telemetry'] includes += include_directories('../librte_telemetry') endif