From 4f299b7169000aa55fe7a48fe98736f728e4f710 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 29 Jun 2020 22:31:19 +0200 Subject: [PATCH] build: replace meson OS detection with variable Some places were calling the meson function host_machine.system() instead of the variables is_windows and is_linux defined in config/meson.build. At the same time, the missing "Linux restriction" reason is added to pfe and octeontx2 crypto PMDs. Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson Acked-by: Akhil Goyal --- buildtools/pmdinfogen/meson.build | 2 +- drivers/crypto/octeontx2/meson.build | 5 +++-- drivers/net/pfe/meson.build | 3 ++- examples/ntb/meson.build | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/buildtools/pmdinfogen/meson.build b/buildtools/pmdinfogen/meson.build index 7da415b3b7..670528fac7 100644 --- a/buildtools/pmdinfogen/meson.build +++ b/buildtools/pmdinfogen/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if host_machine.system() == 'windows' +if is_windows subdir_done() endif diff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build index a28c700b9f..0948e73607 100644 --- a/drivers/crypto/octeontx2/meson.build +++ b/drivers/crypto/octeontx2/meson.build @@ -1,8 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (C) 2019 Marvell International Ltd. -if host_machine.system() != 'linux' - build = false +if not is_linux + build = false + reason = 'only supported on Linux' endif deps += ['bus_pci'] diff --git a/drivers/net/pfe/meson.build b/drivers/net/pfe/meson.build index 3e1a228a3f..da0787c28c 100644 --- a/drivers/net/pfe/meson.build +++ b/drivers/net/pfe/meson.build @@ -1,8 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2019 NXP -if host_machine.system() != 'linux' +if not is_linux build = false + reason = 'only supported on Linux' endif deps += ['common_dpaax'] diff --git a/examples/ntb/meson.build b/examples/ntb/meson.build index ab449d0939..45a59350c5 100644 --- a/examples/ntb/meson.build +++ b/examples/ntb/meson.build @@ -7,7 +7,7 @@ # DPDK instance, use 'make' allow_experimental_apis = true -if host_machine.system() != 'linux' +if not is_linux build = false endif deps += 'rawdev' -- 2.20.1