[v3] meson: update minimum required meson version

Message ID 20210323083619.23463-1-gabriel.ganne@6wind.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series [v3] meson: update minimum required meson version |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-abi-testing success Testing PASS
ci/intel-Testing success Testing PASS
ci/iol-testing success Testing PASS
ci/travis-robot success travis build: passed
ci/github-robot success github build: passed

Commit Message

Gabriel Ganne March 23, 2021, 8:36 a.m. UTC
  Bump meson required version to 0.49.2 which is chosen to be the same as
in both redhat-8 and debian-10.

Update documentation and travis setup script accordingly.

This fixes the following warning:
WARNING: Project targeting '>= 0.47.1' but tried to use feature introduced
         in '0.48.0': console arg in custom_target

'console' argument is used within kernel/linux/kni/meson.build

Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>
---
 .ci/linux-setup.sh                        | 2 +-
 doc/guides/linux_gsg/sys_reqs.rst         | 2 +-
 doc/guides/prog_guide/build-sdk-meson.rst | 2 +-
 doc/guides/windows_gsg/build_dpdk.rst     | 2 +-
 meson.build                               | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
  

Comments

Bruce Richardson March 23, 2021, 9:41 a.m. UTC | #1
On Tue, Mar 23, 2021 at 09:36:18AM +0100, Gabriel Ganne wrote:
> Bump meson required version to 0.49.2 which is chosen to be the same as
> in both redhat-8 and debian-10.
> 
> Update documentation and travis setup script accordingly.
> 
> This fixes the following warning:
> WARNING: Project targeting '>= 0.47.1' but tried to use feature introduced
>          in '0.48.0': console arg in custom_target
> 
> 'console' argument is used within kernel/linux/kni/meson.build
> 
> Signed-off-by: Gabriel Ganne <gabriel.ganne@6wind.com>

Repeating here the comment I had on earlier thread - I'd drop the ".2" when
not necessary, i.e. unless we find there are bugs that cause us issues with
0.49 or 0.49.1. In general I think it's better to keep the required meson
version only at the major release level. The reason it's currently at
0.47.1 rather than 0.47, was that 0.47 had a bug that prevented DPDK builds
from working correctly.

Regards,
/Bruce
  

Patch

diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh
index 5d3089cadd62..ca35b4b38d67 100755
--- a/.ci/linux-setup.sh
+++ b/.ci/linux-setup.sh
@@ -1,7 +1,7 @@ 
 #!/bin/sh -xe
 
 # need to install as 'root' since some of the unit tests won't run without it
-sudo python3 -m pip install --upgrade 'meson==0.47.1'
+sudo python3 -m pip install --upgrade 'meson==0.49.2'
 
 # setup hugepages. error ignored because having hugepage is not mandatory.
 cat /proc/meminfo
diff --git a/doc/guides/linux_gsg/sys_reqs.rst b/doc/guides/linux_gsg/sys_reqs.rst
index d7ea8520e558..dfe8f4ef3bfb 100644
--- a/doc/guides/linux_gsg/sys_reqs.rst
+++ b/doc/guides/linux_gsg/sys_reqs.rst
@@ -45,7 +45,7 @@  Compilation of the DPDK
 
 *   Python 3.5 or later.
 
-*   Meson (version 0.47.1+) and ninja
+*   Meson (version 0.49.2+) and ninja
 
     * ``meson`` & ``ninja-build`` packages in most Linux distributions
 
diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst
index 3429e264797d..b54a0b7b57ff 100644
--- a/doc/guides/prog_guide/build-sdk-meson.rst
+++ b/doc/guides/prog_guide/build-sdk-meson.rst
@@ -35,7 +35,7 @@  The ``meson`` tool is used to configure a DPDK build. On most Linux
 distributions this can be got using the local package management system,
 e.g. ``dnf install meson`` or ``apt-get install meson``. If meson is not
 available as a suitable package, it can also be installed using the Python
-3 ``pip`` tool, e.g. ``pip3 install meson``. Version 0.47.1 of meson is
+3 ``pip`` tool, e.g. ``pip3 install meson``. Version 0.49.2 of meson is
 required - if the version packaged is too old, the latest version is
 generally available from "pip".
 
diff --git a/doc/guides/windows_gsg/build_dpdk.rst b/doc/guides/windows_gsg/build_dpdk.rst
index 5f1395f3d483..0c5979dc193e 100644
--- a/doc/guides/windows_gsg/build_dpdk.rst
+++ b/doc/guides/windows_gsg/build_dpdk.rst
@@ -64,7 +64,7 @@  A good option to choose is the MSI installer for both meson and ninja together::
 
 	http://mesonbuild.com/Getting-meson.html#installing-meson-and-ninja-with-the-msi-installer%22
 
-Recommended version is either Meson 0.47.1 (baseline) or the latest release.
+Recommended version is either Meson 0.49.2 (baseline) or the latest release.
 
 Install the Backend
 -------------------
diff --git a/meson.build b/meson.build
index 7778e18200a9..60973fb18ac3 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@  project('DPDK', 'C',
 		files('VERSION')).stdout().strip(),
 	license: 'BSD',
 	default_options: ['buildtype=release', 'default_library=static'],
-	meson_version: '>= 0.47.1'
+	meson_version: '>= 0.49.2'
 )
 
 # set up some global vars for compiler, platform, configuration, etc.