From patchwork Mon Jun 29 20:36:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 72437 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 31D3DA0350; Mon, 29 Jun 2020 22:37:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 30DF91BEE3; Mon, 29 Jun 2020 22:37:20 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 359E61BEDF for ; Mon, 29 Jun 2020 22:37:18 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 606135C016C; Mon, 29 Jun 2020 16:37:17 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 29 Jun 2020 16:37:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=KF03740MxFdEPQoJD12JQJpRtr D9yLKLYk9NpJ3GqrM=; b=sGDWrpe5DqoSoH00v44m/eMX05phvcO1aXkk1VyExu JFdS1XuQjh96aYkPw5hgj82RfqXE3MvPrlUMpUsRwZ2ENB9g6ezhSW+Eh63gaQhf Pn89WFSxF7Uh5YPJqgTPv8+GynSor8FTAPzPbsxgkFDutDPPx5dAfSCHe5ZM6rr4 UGHOeawoq6UjDmnrm3NUov4LjtQ3lr/3iM5z+Zo30Ffp0Wjy3tigQRXxraId3Pb0 s+YfxYI3IW3PWCi4kpIFAPla08jdyCeYftiPLmpvHENlM2GMIZHP5sh+8ayydga6 NpWxkD/c4Twmd+y0VTDCCjaM/PenKMIKQ5QY1dS4YREg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=KF03740MxFdEPQoJD 12JQJpRtrD9yLKLYk9NpJ3GqrM=; b=dK/gbfX4ETcwWfnwwJVi7RVwh7fYYvIr+ chdjXgfhrgq/UzuQwiJroOa7V1QtzrEFWbZVRTOcSIXsWkXwfk1cwbBZLu+ddQ9E wrkfsQRG0iCPjjuKKDz2IgyiVEsxH9kTBgzMTPwFOCTvxzqJYeL2XuPMi3yGv4qU 8oXshbE3uQJR+dTyN5DfJ6aF6Mme3AVY3CRgAZap0W82/KUeJDIchkc8ojpzg5ZT IRe05VVt0CQ7EQwjKlc3mWwins0tYwpx7pUqvioIsNaVZvlbPAoUpx++Am50Fag7 +F4lzDngxf+ML7ztw0mmMwap6XXXyvmdl5h/vh0PYREG8e4FlM6VA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudelledgjeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgrshcu ofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuggftrf grthhtvghrnhepvdelvdduhedvudduveeuvdevheegudelgeeigfejheduhedttdegudff jeeihffgnecukfhppeejjedrudefgedrvddtfedrudekgeenucevlhhushhtvghrufhiii gvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhn rdhnvght X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 87C37328005D; Mon, 29 Jun 2020 16:37:15 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, Neil Horman , Ankur Dwivedi , Anoob Joseph , Gagandeep Singh , Akhil Goyal , Xiaoyun Li , Jingjing Wu Date: Mon, 29 Jun 2020 22:36:56 +0200 Message-Id: <20200629203656.39052-1-thomas@monjalon.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] build: replace meson OS detection with variable X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Some places were calling the meson function host_machine.system() instead of the variables is_windows and is_linux defined in config/meson.build. Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson --- buildtools/pmdinfogen/meson.build | 2 +- drivers/crypto/octeontx2/meson.build | 2 +- drivers/net/pfe/meson.build | 2 +- examples/ntb/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 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..e3d34db38a 100644 --- a/drivers/crypto/octeontx2/meson.build +++ b/drivers/crypto/octeontx2/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (C) 2019 Marvell International Ltd. -if host_machine.system() != 'linux' +if not is_linux build = false endif diff --git a/drivers/net/pfe/meson.build b/drivers/net/pfe/meson.build index 3e1a228a3f..6d4b838eb7 100644 --- a/drivers/net/pfe/meson.build +++ b/drivers/net/pfe/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2019 NXP -if host_machine.system() != 'linux' +if not is_linux build = false 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'