From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id B9753A04B5;
Wed, 4 Dec 2019 11:06:05 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 0C1FD1BF6E;
Wed, 4 Dec 2019 11:06:04 +0100 (CET)
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
[207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 163161BE83
for <dev@dpdk.org>; Wed, 4 Dec 2019 11:06:02 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1575453961;
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:
content-transfer-encoding:content-transfer-encoding;
bh=ZmluaLQfG86DnjxmlsnVYObC+yV00GguHb+Aa8QvAKY=;
b=Tm4VWj2xDN42BjLKjAAY9oDZyfkHEvoDHpmQWMPUBXVisxljX9exJnM3GhRCOQ594TODm4
hnAnceBX263TxNFxpKVw5Y1ieKT5zs176N1CRcGh30nRJlPAnyBL3BCSR69cHkY2zO9jtS
WyeoDrGBd/DUq8h4KaHeaAE5xq5c2e8=
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
us-mta-227-mUJYyCQRNq6k57AHSYOHYw-1; Wed, 04 Dec 2019 05:05:58 -0500
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
[10.5.11.13])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 22AB0DC00;
Wed, 4 Dec 2019 10:05:57 +0000 (UTC)
Received: from dmarchan.remote.csb (ovpn-205-88.brq.redhat.com [10.40.205.88])
by smtp.corp.redhat.com (Postfix) with ESMTP id 4B3221D1;
Wed, 4 Dec 2019 10:05:55 +0000 (UTC)
From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, stable@dpdk.org, Matan Azrad <matan@mellanox.com>,
Shahaf Shuler <shahafs@mellanox.com>,
Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Date: Wed, 4 Dec 2019 11:05:46 +0100
Message-Id: <20191204100546.32095-1-david.marchand@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-MC-Unique: mUJYyCQRNq6k57AHSYOHYw-1
X-Mimecast-Spam-Score: 0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Subject: [dpdk-dev] [PATCH] drivers/net: fix mlx* glue libraries ABI version
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Those libraries have been missed when switching to global ABI version.
Fixes: cba806e07d6f ("build: change ABI versioning to global")
Cc: stable@dpdk.org
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
drivers/net/mlx4/Makefile | 2 +-
drivers/net/mlx4/meson.build | 2 +-
drivers/net/mlx5/Makefile | 2 +-
drivers/net/mlx5/meson.build | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
index 329569dc10..dac5c5f64c 100644
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
@@ -8,7 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
LIB =3D librte_pmd_mlx4.a
LIB_GLUE =3D $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
LIB_GLUE_BASE =3D librte_pmd_mlx4_glue.so
-LIB_GLUE_VERSION =3D 18.02.0
+LIB_GLUE_VERSION =3D $(shell cat $(RTE_SRCDIR)/ABI_VERSION)
=20
# Sources.
SRCS-$(CONFIG_RTE_LIBRTE_MLX4_PMD) +=3D mlx4.c
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 9eb4988420..3ef946fef0 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -11,7 +11,7 @@ build =3D true
=20
pmd_dlopen =3D (get_option('ibverbs_link') =3D=3D 'dlopen')
LIB_GLUE_BASE =3D 'librte_pmd_mlx4_glue.so'
-LIB_GLUE_VERSION =3D '18.02.0'
+LIB_GLUE_VERSION =3D abi_version
LIB_GLUE =3D LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
if pmd_dlopen
=09dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index c5cf4397ac..90a9eeb61f 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -8,7 +8,7 @@ include $(RTE_SDK)/mk/rte.vars.mk
LIB =3D librte_pmd_mlx5.a
LIB_GLUE =3D $(LIB_GLUE_BASE).$(LIB_GLUE_VERSION)
LIB_GLUE_BASE =3D librte_pmd_mlx5_glue.so
-LIB_GLUE_VERSION =3D 19.08.0
+LIB_GLUE_VERSION =3D $(shell cat $(RTE_SRCDIR)/ABI_VERSION)
=20
# Sources.
SRCS-$(CONFIG_RTE_LIBRTE_MLX5_PMD) +=3D mlx5.c
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index d6b32db794..0216c22573 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -11,7 +11,7 @@ build =3D true
=20
pmd_dlopen =3D (get_option('ibverbs_link') =3D=3D 'dlopen')
LIB_GLUE_BASE =3D 'librte_pmd_mlx5_glue.so'
-LIB_GLUE_VERSION =3D '19.08.0'
+LIB_GLUE_VERSION =3D abi_version
LIB_GLUE =3D LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
if pmd_dlopen
=09dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
--=20
2.23.0