diff mbox series

[v2,1/3] meson: fix minimum required meson version

Message ID 20210322140609.7564-1-gabriel.ganne@6wind.com (mailing list archive)
State Superseded
Delegated to: Thomas Monjalon
Headers show
Series [v2,1/3] meson: fix minimum required meson version | expand

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Gabriel Ganne March 22, 2021, 2:06 p.m. UTC
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

Update documentation and travis setup script accordingly.

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(-)
diff mbox series

Patch

diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh
index 5d3089cadd62..a181029ec49a 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.48'
 
 # 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..6a1712f3145c 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.48.0+) 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..4f3d0bd21f1a 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.48.0 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..854b8b05cfff 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.48.0 (baseline) or the latest release.
 
 Install the Backend
 -------------------
diff --git a/meson.build b/meson.build
index 7778e18200a9..65c46f051365 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.48.0'
 )
 
 # set up some global vars for compiler, platform, configuration, etc.