From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D3F24A0350; Tue, 30 Jun 2020 14:08:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B16DB1BF74; Tue, 30 Jun 2020 14:08:27 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 37B7F1B75C for ; Tue, 30 Jun 2020 14:08:26 +0200 (CEST) IronPort-SDR: ld2xaN4td8GJU/bC7SGhMBTla1zm2X4a227djUcuvbooMuVGvdnFI0+eBIt2FixJg+mIlpBu9k UeWFgC3GZb/Q== X-IronPort-AV: E=McAfee;i="6000,8403,9666"; a="125848806" X-IronPort-AV: E=Sophos;i="5.75,297,1589266800"; d="scan'208";a="125848806" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2020 05:08:25 -0700 IronPort-SDR: TLuydNAA1u/eX581uouKzJWGDHoDAFZLF2Lu3A/DAeV8pt8UJqBrFAk1f55F0t5lavqBp3D7MG YqO2gc9o/40w== X-IronPort-AV: E=Sophos;i="5.75,297,1589266800"; d="scan'208";a="425183828" Received: from bricha3-mobl.ger.corp.intel.com ([10.252.16.182]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 30 Jun 2020 05:08:23 -0700 Date: Tue, 30 Jun 2020 13:08:19 +0100 From: Bruce Richardson To: Thomas Monjalon Cc: dev@dpdk.org, david.marchand@redhat.com, Neil Horman , Ankur Dwivedi , Anoob Joseph , Gagandeep Singh , Akhil Goyal , Xiaoyun Li , Jingjing Wu Message-ID: <20200630120819.GA583@bricha3-MOBL.ger.corp.intel.com> References: <20200629203656.39052-1-thomas@monjalon.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200629203656.39052-1-thomas@monjalon.net> Subject: Re: [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" On Mon, Jun 29, 2020 at 10:36:56PM +0200, Thomas Monjalon wrote: > 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 though while changing this it would be good if you could take care of the one additional comment below also. > --- > 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 > This and the other instances below should also set "reason" variable so we get in the output log at the end why they are not being built. Generally drivers copy-paste this line: reason = 'only supported on Linux' > 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' > -- > 2.26.2 >