From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3433CA0545; Wed, 15 Jul 2020 13:33:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A9B91BEDF; Wed, 15 Jul 2020 13:33:12 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 0C23B1BED7 for ; Wed, 15 Jul 2020 13:33:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594812790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ifA/bkE2M/UFPcF393JdF1lZW4h55L0EF3cf3JQlNlA=; b=caMcI0hDkWfMQL2kO4sivGAlyJ2d+m9afStxMGmk0bEHReXaoYgjdarW01B9FTKY8JS0Me sjP20KbVySmJq5OdanaLrS9HErOwQMy7ecre8kDlsPlEhp2FovIt++b8h9HkSFxKfcorOI OIqrcdzMVU5beUeSsPVIwKvXWITL/pA= Received: from mail-vk1-f197.google.com (mail-vk1-f197.google.com [209.85.221.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-293-JEuDGLRoOCWfzsZ6kI164Q-1; Wed, 15 Jul 2020 07:33:07 -0400 X-MC-Unique: JEuDGLRoOCWfzsZ6kI164Q-1 Received: by mail-vk1-f197.google.com with SMTP id m22so649662vka.22 for ; Wed, 15 Jul 2020 04:33:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ifA/bkE2M/UFPcF393JdF1lZW4h55L0EF3cf3JQlNlA=; b=tnqkGrk9GxAGSwo4SpAKzFFbZTaQk0YIzd5QbHX4AxxDFbyzXMYSCP2JbBWHKM0Xcg M+KBeqdTYGRUSopPZ3x1n0yW4K7v2tzo6mXH+JGK0VJej+3jQSQU/Ii+C8Ch1DtyTEAo 42/YvW6W55DxkB+gRZk21rO1+bIbgbLtfTIljmSKNhmbosJO81cGN5GwZt13AbLFTdVg fyGCQQy3KDGDlpsLEE9eaI+oLXs5+bdkU6Pij0paN9bmGqH2RDxmMouiQ2wEIXVsophh 8PEKleaO3CxFnTgeNyLsALHLseELoCn5tSJ9K9zuDUw6l1QhPVy7gEqHMQbCH0nNgFYI Vwvg== X-Gm-Message-State: AOAM533tW8IoaX9Ps0HvQFztKAfonSwEI2bbFXv+vhNV7xaOhBac1kKk HfisOwhpDpDWyRWnrYout0SP2hLyjVtMvYfdg52aBvks6DCOXzTVwGEopDabEAp/xlGpGbiow/H waMSfvHUKxY1EuxOdSP4= X-Received: by 2002:a67:b741:: with SMTP id l1mr6749833vsh.180.1594812787350; Wed, 15 Jul 2020 04:33:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJwwlTAZG4JuQuvR5eKp/FpHjxqoewo7Yxlkjxrm+gSrZ8xVbdmEgYZ304DpecdG4nYpMwLyKmXM4YGLAxuP0= X-Received: by 2002:a67:b741:: with SMTP id l1mr6749812vsh.180.1594812787133; Wed, 15 Jul 2020 04:33:07 -0700 (PDT) MIME-Version: 1.0 References: <20200714123912.61208-1-ciara.power@intel.com> In-Reply-To: <20200714123912.61208-1-ciara.power@intel.com> From: David Marchand Date: Wed, 15 Jul 2020 13:32:56 +0200 Message-ID: To: Ciara Power Cc: dev , Bruce Richardson , dpdk stable , "Wiles, Keith" X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [dpdk-stable] [PATCH] metrics: fix installation of metrics header X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, Jul 14, 2020 at 2:43 PM Ciara Power 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 > --- > 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