From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 81D39A0553
for <public@inbox.dpdk.org>; Mon, 17 Feb 2020 19:07:26 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 5196B1DA11;
Mon, 17 Feb 2020 19:07:26 +0100 (CET)
Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com
[66.111.4.29]) by dpdk.org (Postfix) with ESMTP id 8716C1DA11
for <stable@dpdk.org>; Mon, 17 Feb 2020 19:07:24 +0100 (CET)
Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
by mailout.nyi.internal (Postfix) with ESMTP id 2BAF222012;
Mon, 17 Feb 2020 13:07:24 -0500 (EST)
Received: from mailfrontend1 ([10.202.2.162])
by compute1.internal (MEProxy); Mon, 17 Feb 2020 13:07:24 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding:content-type; s=mesmtp;
bh=e9v/tAzSEPlC8wEZk7ZNac32gqsxtcdft7EqhAGBq/s=; b=DHo4+E1ISgk2
q3Zph2jJFGdbsGknHyrL7DJ2wPeqrH6tVSVF96buQekxLjMUQKbbELKTsdctPBKC
u5FU6WyTYdIEWVutG2h1SDDA0Y3sK3m+EvZx53zXJn5bhmR2nAC0NcWA9EQjuZ9f
xlDqPMF642RJTEjeyW7BcKF0gIsbiq0=
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:content-type
:date:from:in-reply-to:message-id:mime-version:references
:subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender
:x-sasl-enc; s=fm2; bh=e9v/tAzSEPlC8wEZk7ZNac32gqsxtcdft7EqhAGBq
/s=; b=Oz87G7eYqBv+sJ1kxfMZpCYIwpIPHzFAXBU03ZljkN9luTAHpS0FCUrQm
UnUmM6r4WcBJrEkggnJw5YbFRKX8m/b8sSaYilJtEkA+2yt4CI8tp9E9XDttv0Y2
GEs5sm71IsgrrEce4aaC6NrN3N+OQoumwZru1zYjSSMbLS/uUpuwJTlNLWjvRPGv
axAwYJdGzv+NdsnFDO1vqYP8bgkBKTUJKNFge9wze9dfxChC7pTIfjtMfTjdJfs2
xNwlTjEpF7BmqJb5Go30RUKcAuat6lBOLxhplRnyeNpYxOj1gYbtJLFaJkez8Apd
fzSjELlG42yTYmzmqHCq1K7I5Mk/A==
X-ME-Sender: <xms:W9ZKXp_UXpIYCDLvzqu_d1TpbhuTD81u7S903gmEsPTTBshKfSwDPA>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedrjeeigdduuddtucetufdoteggodetrfdotf
fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen
uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne
cujfgurhephffvufffkfgjfhgggfgtsehtufertddttddvnecuhfhrohhmpefvhhhomhgr
shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuff
homhgrihhnpehgihhthhhusgdrtghomhdpughpughkrdhorhhgnecukfhppeejjedrudef
gedrvddtfedrudekgeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih
hlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvght
X-ME-Proxy: <xmx:W9ZKXh9XIAvgTzE21QEAGXxUM061eVwHn5U0mZFGDps82sBg5K3eRw>
<xmx:W9ZKXiDfSb95GXz4CMckylD0Hy7eo2Aov36Wsis-BrwgX3SNO-cqMg>
<xmx:W9ZKXhzKaVH8cAM_z5eXIm4FOa0z2-qXVl8-DskNBZclvqlR8-Ax3Q>
<xmx:XNZKXqy8Jtfzs_GVy71spTXwt6ITZADn642kum1P-NVzGgSJA2IoEQ>
Received: from xps.localnet (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 4167E3280060;
Mon, 17 Feb 2020 13:07:23 -0500 (EST)
From: Thomas Monjalon <thomas@monjalon.net>
To: Luca Boccassi <luca.boccassi@gmail.com>
Cc: Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Mon, 17 Feb 2020 19:07:22 +0100
Message-ID: <4043715.ElGaqSPkdT@xps>
In-Reply-To: <5027c9e36251459fd7061bd81ab5c3214e50cf59.camel@gmail.com>
References: <20200211112216.3929-190-luca.boccassi@gmail.com>
<20200217174546.25334-36-luca.boccassi@gmail.com>
<5027c9e36251459fd7061bd81ab5c3214e50cf59.camel@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
Subject: Re: [dpdk-stable] patch 'net/mlx: fix overlinking with meson and
glue dlopen' has been queued to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
17/02/2020 18:50, Luca Boccassi:
> This one required a few extra backports, you can see the end result at:
>
> https://github.com/bluca/dpdk-stable/blob/19.11/drivers/net/mlx4/meson.build
> https://github.com/bluca/dpdk-stable/blob/19.11/drivers/net/mlx5/meson.build
>
> I can drop the series of changes to mlx's meson.build alternatively if
> you prefer.
Your backport looks OK, thanks.
There is just a unneeded redundant allow_experimental_apis.
> On Mon, 2020-02-17 at 17:45 +0000, luca.boccassi@gmail.com wrote:
> > Hi,
> >
> > FYI, your patch has been queued to stable release 19.11.1
> >
> > Note it hasn't been pushed to
> > http://dpdk.org/browse/dpdk-stable
> > yet.
> > It will be pushed if I get no objections before 02/19/20. So please
> > shout if anyone has objections.
> >
> > Also note that after the patch there's a diff of the upstream commit
> > vs the
> > patch applied to the branch. This will indicate if there was any
> > rebasing
> > needed to apply to the stable branch. If there were code changes for
> > rebasing
> > (ie: not only metadata diffs), please double check that the rebase
> > was
> > correctly done.
> >
> > Thanks.
> >
> > Luca Boccassi
> >
> > ---
> > From 3253622dc4630e11207629aba50293049938ec20 Mon Sep 17 00:00:00
> > 2001
> > From: Thomas Monjalon <
> > thomas@monjalon.net
> > >
> > Date: Wed, 12 Feb 2020 23:07:08 +0100
> > Subject: [PATCH] net/mlx: fix overlinking with meson and glue dlopen
> >
> > [ upstream commit e21492a5175af31ae568fa5fabef1f4b22706962 ]
> >
> > If ibverbs_link is dlopen, the PMD and application should not
> > be linked with ibverbs, but the glue library is.
> > Unfortunately the ibverbs dependency was exported in the
> > variable ext_deps, so there were overlinking.
> >
> > It is fixed by not exporting the dependency in ext_deps,
> > and recreating a limited dependency object for cflags only.
> >
> > Fixes: 1dd7c7e38c19 ("net/mlx4: support meson build")
> > Fixes: 96d7c62a70c7 ("net/mlx5: support meson build")
> > Cc:
> > stable@dpdk.org
> >
> >
> > Signed-off-by: Thomas Monjalon <
> > thomas@monjalon.net
> > >
> > Acked-by: Bruce Richardson <
> > bruce.richardson@intel.com
> > >
> > ---
> > drivers/net/mlx4/meson.build | 6 ++++--
> > drivers/net/mlx5/meson.build | 4 +++-
> > 2 files changed, 7 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/net/mlx4/meson.build
> > b/drivers/net/mlx4/meson.build
> > index 17711f154b..ff7386aee2 100644
> > --- a/drivers/net/mlx4/meson.build
> > +++ b/drivers/net/mlx4/meson.build
> > @@ -31,7 +31,7 @@ foreach libname:libnames
> > endif
> > if lib.found()
> > libs += lib
> > - if not static_ibverbs
> > + if not static_ibverbs and not dlopen_ibverbs
> > ext_deps += lib
> > endif
> > else
> > @@ -41,10 +41,12 @@ foreach libname:libnames
> > endforeach
> >
> > if build
> > - if static_ibverbs
> > + if static_ibverbs or dlopen_ibverbs
> > # Build without adding shared libs to Requires.private
> > ibv_cflags = run_command(pkgconf, '--cflags',
> > 'libibverbs').stdout()
> > ext_deps += declare_dependency(compile_args:
> > ibv_cflags.split())
> > + endif
> > + if static_ibverbs
> > # Add static deps ldflags to internal apps and
> > Libs.private
> > ibv_ldflags = run_command(ldflags_ibverbs_static,
> > check:true).stdout()
> > ext_deps +=
> > declare_dependency(link_args:ibv_ldflags.split())
> > diff --git a/drivers/net/mlx5/meson.build
> > b/drivers/net/mlx5/meson.build
> > index e21f3d8dc8..dab1b83fd3 100644
> > --- a/drivers/net/mlx5/meson.build
> > +++ b/drivers/net/mlx5/meson.build
> > @@ -41,10 +41,12 @@ foreach libname:libnames
> > endforeach
> >
> > if build
> > - if static_ibverbs
> > + if static_ibverbs or dlopen_ibverbs
> > # Build without adding shared libs to Requires.private
> > ibv_cflags = run_command(pkgconf, '--cflags',
> > 'libibverbs').stdout()
> > ext_deps += declare_dependency(compile_args:
> > ibv_cflags.split())
> > + endif
> > + if static_ibverbs
> > # Add static deps ldflags to internal apps and
> > Libs.private
> > ibv_ldflags = run_command(ldflags_ibverbs_static,
> > check:true).stdout()
> > ext_deps +=
> > declare_dependency(link_args:ibv_ldflags.split())
> >
>