* [dpdk-dev] [PATCH] metrics: fix installation of metrics header
@ 2020-07-14 12:39 Ciara Power
2020-07-15 11:32 ` [dpdk-dev] [dpdk-stable] " David Marchand
0 siblings, 1 reply; 3+ messages in thread
From: Ciara Power @ 2020-07-14 12:39 UTC (permalink / raw)
To: dev; +Cc: bruce.richardson, Ciara Power, stable
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [dpdk-stable] [PATCH] metrics: fix installation of metrics header
2020-07-14 12:39 [dpdk-dev] [PATCH] metrics: fix installation of metrics header Ciara Power
@ 2020-07-15 11:32 ` David Marchand
2020-07-17 9:36 ` David Marchand
0 siblings, 1 reply; 3+ messages in thread
From: David Marchand @ 2020-07-15 11:32 UTC (permalink / raw)
To: Ciara Power; +Cc: dev, Bruce Richardson, dpdk stable, Wiles, Keith
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [dpdk-stable] [PATCH] metrics: fix installation of metrics header
2020-07-15 11:32 ` [dpdk-dev] [dpdk-stable] " David Marchand
@ 2020-07-17 9:36 ` David Marchand
0 siblings, 0 replies; 3+ messages in thread
From: David Marchand @ 2020-07-17 9:36 UTC (permalink / raw)
To: Ciara Power; +Cc: dev, Bruce Richardson, dpdk stable, Wiles, Keith
On Wed, Jul 15, 2020 at 1:32 PM David Marchand
<david.marchand@redhat.com> wrote:
> 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>
> Acked-by: David Marchand <david.marchand@redhat.com>
Applied, thanks.
--
David Marchand
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-17 9:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-14 12:39 [dpdk-dev] [PATCH] metrics: fix installation of metrics header Ciara Power
2020-07-15 11:32 ` [dpdk-dev] [dpdk-stable] " David Marchand
2020-07-17 9:36 ` David Marchand
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).