build: fix meson build on FreeBSD

Message ID 20180720135336.9639-1-bruce.richardson@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Bruce Richardson
Headers
Series build: fix meson build on FreeBSD |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Bruce Richardson July 20, 2018, 1:53 p.m. UTC
  A number of drivers have dependencies on libraries which
are only built on Linux, and so they need to be disabled
on FreeBSD. Rather than basing the disabling on OS, in
each case we base the building of the library on the
presence of the required dependency.

Fixes: 50385c106021 ("net/ifc: add to meson build")
Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")
Fixes: 5936aa3a39b9 ("net/vhost: add to meson build")
Fixes: 3298fa4853b8 ("raw/dpaa2_cmdif: introduce DPAA2 command interface driver")
Fixes: b1ee472fed58 ("raw/dpaa2_qdma: introduce the DPAA2 QDMA driver")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/ifc/meson.build         | 1 +
 drivers/net/netvsc/meson.build      | 1 +
 drivers/net/vhost/meson.build       | 1 +
 drivers/raw/dpaa2_cmdif/meson.build | 1 +
 drivers/raw/dpaa2_qdma/meson.build  | 1 +
 5 files changed, 5 insertions(+)
  

Comments

Thomas Monjalon July 26, 2018, 8:02 a.m. UTC | #1
20/07/2018 15:53, Bruce Richardson:
> A number of drivers have dependencies on libraries which
> are only built on Linux, and so they need to be disabled
> on FreeBSD. Rather than basing the disabling on OS, in
> each case we base the building of the library on the
> presence of the required dependency.
> 
> Fixes: 50385c106021 ("net/ifc: add to meson build")
> Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")
> Fixes: 5936aa3a39b9 ("net/vhost: add to meson build")
> Fixes: 3298fa4853b8 ("raw/dpaa2_cmdif: introduce DPAA2 command interface driver")
> Fixes: b1ee472fed58 ("raw/dpaa2_qdma: introduce the DPAA2 QDMA driver")
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

Applied, thanks
  

Patch

diff --git a/drivers/net/ifc/meson.build b/drivers/net/ifc/meson.build
index a30aa09e6..72df070ac 100644
--- a/drivers/net/ifc/meson.build
+++ b/drivers/net/ifc/meson.build
@@ -1,6 +1,7 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
+build = dpdk_conf.has('RTE_LIBRTE_VHOST')
 allow_experimental_apis = true
 sources = files('ifcvf_vdpa.c', 'base/ifcvf.c')
 includes += include_directories('base')
diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build
index a15b50487..a717cdd48 100644
--- a/drivers/net/netvsc/meson.build
+++ b/drivers/net/netvsc/meson.build
@@ -1,6 +1,7 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Microsoft Corporation
 
+build = dpdk_conf.has('RTE_LIBRTE_VMBUS_BUS')
 version = 2
 sources = files('hn_ethdev.c', 'hn_rxtx.c', 'hn_rndis.c', 'hn_nvs.c')
 
diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
index a8f77e1ab..9b067c35e 100644
--- a/drivers/net/vhost/meson.build
+++ b/drivers/net/vhost/meson.build
@@ -1,6 +1,7 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
+build = dpdk_conf.has('RTE_LIBRTE_VHOST')
 version = 2
 sources = files('rte_eth_vhost.c')
 install_headers('rte_eth_vhost.h')
diff --git a/drivers/raw/dpaa2_cmdif/meson.build b/drivers/raw/dpaa2_cmdif/meson.build
index 8c9094382..1d146872e 100644
--- a/drivers/raw/dpaa2_cmdif/meson.build
+++ b/drivers/raw/dpaa2_cmdif/meson.build
@@ -1,6 +1,7 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2018 NXP
 
+build = dpdk_conf.has('RTE_LIBRTE_DPAA2_MEMPOOL')
 deps += ['rawdev', 'mempool_dpaa2', 'bus_vdev']
 sources = files('dpaa2_cmdif.c')
 
diff --git a/drivers/raw/dpaa2_qdma/meson.build b/drivers/raw/dpaa2_qdma/meson.build
index a2eb1d2f4..b6a081f11 100644
--- a/drivers/raw/dpaa2_qdma/meson.build
+++ b/drivers/raw/dpaa2_qdma/meson.build
@@ -1,6 +1,7 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2018 NXP
 
+build = dpdk_conf.has('RTE_LIBRTE_DPAA2_MEMPOOL')
 deps += ['rawdev', 'mempool_dpaa2', 'ring']
 sources = files('dpaa2_qdma.c')