DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ciara Power <ciara.power@intel.com>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, Ciara Power <ciara.power@intel.com>,
	stable@dpdk.org
Subject: [dpdk-dev] [PATCH] metrics: fix installation of metrics header
Date: Tue, 14 Jul 2020 13:39:12 +0100
Message-ID: <20200714123912.61208-1-ciara.power@intel.com> (raw)

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 <ciara.power@intel.com>
---
 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
-- 
2.17.1


             reply	other threads:[~2020-07-14 12:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-14 12:39 Ciara Power [this message]
2020-07-15 11:32 ` [dpdk-dev] [dpdk-stable] " David Marchand
2020-07-17  9:36   ` David Marchand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200714123912.61208-1-ciara.power@intel.com \
    --to=ciara.power@intel.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git