From: David Marchand <david.marchand@redhat.com>
To: Ciara Power <ciara.power@intel.com>
Cc: dev <dev@dpdk.org>, Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>,
"Wiles, Keith" <keith.wiles@intel.com>
Subject: Re: [dpdk-dev] [dpdk-stable] [PATCH] metrics: fix installation of metrics header
Date: Wed, 15 Jul 2020 13:32:56 +0200 [thread overview]
Message-ID: <CAJFAV8zrfoWDvCAU-t4JUF3NzRj9KYsgLDVs9zHC7tx210SJ9w@mail.gmail.com> (raw)
In-Reply-To: <20200714123912.61208-1-ciara.power@intel.com>
On Tue, Jul 14, 2020 at 2:43 PM Ciara Power <ciara.power@intel.com> wrote:
>
> 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
Reproduced the issue.
The fix lgtm.
Acked-by: David Marchand <david.marchand@redhat.com>
--
David Marchand
next prev parent reply other threads:[~2020-07-15 11:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-14 12:39 [dpdk-dev] [PATCH] metrics: fix installation of metrics header Ciara Power
2020-07-15 11:32 ` David Marchand [this message]
2020-07-17 9:36 ` [dpdk-dev] [dpdk-stable] " 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=CAJFAV8zrfoWDvCAU-t4JUF3NzRj9KYsgLDVs9zHC7tx210SJ9w@mail.gmail.com \
--to=david.marchand@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=ciara.power@intel.com \
--cc=dev@dpdk.org \
--cc=keith.wiles@intel.com \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.