From c49825f8956bffcd23502a4dd98b3a32d66bb975 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 20 Jul 2018 14:53:36 +0100 Subject: [PATCH] build: fix meson build on FreeBSD 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 --- 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(+) diff --git a/drivers/net/ifc/meson.build b/drivers/net/ifc/meson.build index a30aa09e66..72df070acb 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 a15b504870..a717cdd483 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 a8f77e1abf..9b067c35eb 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 8c90943826..1d146872ed 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 a2eb1d2f42..b6a081f117 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') -- 2.20.1