From: Kevin Traynor <ktraynor@redhat.com>
To: stable@dpdk.org
Cc: ktraynor@redhat.com, Thomas Monjalon <thomas@monjalon.net>,
Bruce Richardson <bruce.richardson@intel.com>,
Matan Azrad <matan@mellanox.com>
Subject: [dpdk-stable] [18.11 7/7] net/mlx: allow build only on Linux
Date: Thu, 9 Jan 2020 13:34:33 +0000 [thread overview]
Message-ID: <20200109133433.12494-8-ktraynor@redhat.com> (raw)
In-Reply-To: <20200109133433.12494-1-ktraynor@redhat.com>
From: Thomas Monjalon <thomas@monjalon.net>
[ upstream commit 3dee3f1b52127fac8943cbcb08e11328ef666046 ]
Currently mlx4/mlx5 support only Linux.
Fixes: 39a7ab1c14e2 ("net/mlx4: remove dependency on libmnl in meson")
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
drivers/net/mlx4/meson.build | 11 +++++++++--
drivers/net/mlx5/meson.build | 10 +++++++++-
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 4145f5db3..ebad30a04 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -3,4 +3,11 @@
# Copyright 2018 Mellanox Technologies, Ltd
+if host_machine.system() != 'linux'
+ build = false
+ reason = 'only supported on Linux'
+ subdir_done()
+endif
+build = true
+
pmd_dlopen = get_option('enable_driver_mlx_glue')
LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so'
@@ -14,9 +21,9 @@ if pmd_dlopen
]
endif
+
libs = [
cc.find_library('mlx4', required:false),
cc.find_library('ibverbs', required:false),
]
-build = true
foreach lib:libs
if not lib.found()
@@ -24,5 +31,5 @@ foreach lib:libs
endif
endforeach
-# Compile PMD
+
if build
allow_experimental_apis = true
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 81965bddc..87b267a25 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -3,4 +3,11 @@
# Copyright 2018 Mellanox Technologies, Ltd
+if host_machine.system() != 'linux'
+ build = false
+ reason = 'only supported on Linux'
+ subdir_done()
+endif
+build = true
+
pmd_dlopen = get_option('enable_driver_mlx_glue')
LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so'
@@ -14,4 +21,5 @@ if pmd_dlopen
]
endif
+
libs = [
cc.find_library('mnl', required:false),
@@ -19,5 +27,4 @@ libs = [
cc.find_library('ibverbs', required:false),
]
-build = true
foreach lib:libs
if not lib.found()
@@ -25,4 +32,5 @@ foreach lib:libs
endif
endforeach
+
if build
allow_experimental_apis = true
--
2.21.1
next prev parent reply other threads:[~2020-01-09 13:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-09 13:34 [dpdk-stable] [18.11 0/7] Build fixes for 18.11 branch Kevin Traynor
2020-01-09 13:34 ` [dpdk-stable] [18.11 1/7] eal: drop unused macros for primary process check Kevin Traynor
2020-01-09 13:34 ` [dpdk-stable] [18.11 2/7] eventdev: use same log macro for all unsupported calls Kevin Traynor
2020-01-09 13:34 ` [dpdk-stable] [18.11 3/7] eal: remove legacy PMD log macro Kevin Traynor
2020-01-09 13:34 ` [dpdk-stable] [18.11 4/7] net/mlx: fix build with clang 9 Kevin Traynor
2020-01-09 13:34 ` [dpdk-stable] [18.11 5/7] kni: fix ethtool build for gcc 9 Kevin Traynor
2020-01-09 13:34 ` [dpdk-stable] [18.11 6/7] pmdinfogen: fix freebsd build Kevin Traynor
2020-01-09 15:50 ` Neil Horman
2020-01-09 15:53 ` Neil Horman
2020-01-09 16:53 ` Kevin Traynor
2020-01-09 13:34 ` Kevin Traynor [this message]
2020-01-13 16:16 ` [dpdk-stable] [18.11 0/7] Build fixes for 18.11 branch Kevin Traynor
2020-01-14 14:29 ` Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200109133433.12494-8-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=matan@mellanox.com \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).