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 <thomas@monjalon.net> --- 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' -- 2.26.2
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 <thomas@monjalon.net> Acked-by: Bruce Richardson <bruce.richardson@intel.com> 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 >
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 <thomas@monjalon.net> Acked-by: Bruce Richardson <bruce.richardson@intel.com> --- v2: add missing reason to drivers --- 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.26.2
On Tue, Jun 30, 2020 at 03:15:22PM +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.
>
> At the same time, the missing "Linux restriction" reason is added to
> pfe and octeontx2 crypto PMDs.
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> v2: add missing reason to drivers
> ---
Thanks LGTM.
> 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 <thomas@monjalon.net>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
30/06/2020 15:28, Akhil Goyal:
> > 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 <thomas@monjalon.net>
> > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
Applied
> 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 <thomas@monjalon.net>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Anoob Joseph <anoobj@marvell.com>