[dpdk-stable] [PATCH] metrics: fix installation of metrics header

[David Marchand]

On Tue, Jul 14, 2020 at 2:43 PM Ciara Power <ciara.power at 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 at dpdk.org
>
> Signed-off-by: Ciara Power <ciara.power at 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 at redhat.com>


-- 
David Marchand