[dpdk-dev] [PATCH v3 4/5] build: check Windows support per driver
From: Tal Shnaiderman <hidden>
Date: 2021-10-25 08:47:27
Subsystem:
amd cryptographic coprocessor (ccp) driver, crypto api, the rest, virtio core, virtio crypto driver · Maintainers:
Tom Lendacky, John Allen, Herbert Xu, "David S. Miller", Linus Torvalds, "Michael S. Tsirkin", Jason Wang, Gonglei
Remove the check and build failure from crypto/meson.build in case building for Windows OS. Add this check/failure in the meson.build file of each crypto PMD that is not enforcing it to allow PMD support for Windows per driver when applicable. Signed-off-by: Tal Shnaiderman <redacted> Acked-by: Matan Azrad <redacted> --- drivers/crypto/armv8/meson.build | 6 ++++++ drivers/crypto/bcmfs/meson.build | 6 ++++++ drivers/crypto/ccp/meson.build | 1 + drivers/crypto/ipsec_mb/meson.build | 6 ++++++ drivers/crypto/meson.build | 3 --- drivers/crypto/mvsam/meson.build | 6 ++++++ drivers/crypto/null/meson.build | 6 ++++++ drivers/crypto/octeontx/meson.build | 6 ++++++ drivers/crypto/openssl/meson.build | 6 ++++++ drivers/crypto/qat/meson.build | 6 ++++++ drivers/crypto/scheduler/meson.build | 6 ++++++ drivers/crypto/virtio/meson.build | 6 ++++++ 12 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build
index 40a4dbb7bb..5effba8bbc 100644
--- a/drivers/crypto/armv8/meson.build
+++ b/drivers/crypto/armv8/meson.build@@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Arm Limited +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('libAArch64crypto', required: false, method: 'pkg-config') if not dep.found() build = false
diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index d67e78d51b..5842f83a3b 100644
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build@@ -3,6 +3,12 @@ # All rights reserved. # +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + deps += ['eal', 'bus_vdev'] sources = files( 'bcmfs_logs.c',
diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build
index 0f82b9b90b..a4f3406009 100644
--- a/drivers/crypto/ccp/meson.build
+++ b/drivers/crypto/ccp/meson.build@@ -4,6 +4,7 @@ if not is_linux build = false reason = 'only supported on Linux' + subdir_done() endif dep = dependency('libcrypto', required: false, method: 'pkg-config') if not dep.found()
diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build
index d7037daea1..f3a34a60a8 100644
--- a/drivers/crypto/ipsec_mb/meson.build
+++ b/drivers/crypto/ipsec_mb/meson.build@@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2021 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + IMB_required_ver = '1.0.0' lib = cc.find_library('IPSec_MB', required: false) if not lib.found()
diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build
index 2585471e93..59f02ea47c 100644
--- a/drivers/crypto/meson.build
+++ b/drivers/crypto/meson.build@@ -1,9 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if is_windows - subdir_done() -endif drivers = [ 'armv8',
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index fec167bf29..bf3c4323de 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build@@ -3,6 +3,12 @@ # Copyright(c) 2018 Semihalf. # All rights reserved. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('libmusdk', required: false, method: 'pkg-config') if not dep.found() build = false
diff --git a/drivers/crypto/null/meson.build b/drivers/crypto/null/meson.build
index 1f7d644de1..acc16e7d81 100644
--- a/drivers/crypto/null/meson.build
+++ b/drivers/crypto/null/meson.build@@ -1,5 +1,11 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + deps += 'bus_vdev' sources = files('null_crypto_pmd.c', 'null_crypto_pmd_ops.c')
diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build
index bc6187e1cf..387727c6ab 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build@@ -8,6 +8,12 @@ if not is_linux or not dpdk_conf.get('RTE_ARCH_64') subdir_done() endif +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + deps += ['bus_pci'] deps += ['bus_vdev'] deps += ['common_cpt']
diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build
index b21fca0be3..cd962da1d6 100644
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build@@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('libcrypto', required: false, method: 'pkg-config') if not dep.found() build = false
diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index b3b2d17258..d08a24c7b3 100644
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build@@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + # this does not build the QAT driver, instead that is done in the compression # driver which comes later. Here we just add our sources files to the list build = false
diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build
index d510f49970..cd18efc791 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build@@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi <bluca@debian.org> +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + deps += ['bus_vdev', 'reorder'] sources = files( 'rte_cryptodev_scheduler.c',
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index 1b6d77f66f..45533c9b89 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build@@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 HUAWEI TECHNOLOGIES CO., LTD. +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + includes += include_directories('../../../lib/vhost') deps += 'bus_pci' sources = files(
--
2.16.1.windows.4