metrics: fix installation of metrics header
diff mbox series

Message ID 20200714123912.61208-1-ciara.power@intel.com
State Accepted, archived
Delegated to: David Marchand
Headers show
Series
  • metrics: fix installation of metrics header
Related show

Checks

Context Check Description
ci/iol-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/travis-robot success Travis build: passed
ci/iol-broadcom-Performance success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Power, Ciara July 14, 2020, 12:39 p.m. UTC
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(-)

Comments

David Marchand July 15, 2020, 11:32 a.m. UTC | #1
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 July 17, 2020, 9:36 a.m. UTC | #2
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.

Patch
diff mbox series

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