diff mbox series

[v4] meson: update minimum required meson version

Message ID 20210323095219.25044-1-gabriel.ganne@6wind.com (mailing list archive)
State Accepted
Delegated to: Thomas Monjalon
Headers show
Series [v4] meson: update minimum required meson version | expand

Checks

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

Commit Message

Gabriel Ganne March 23, 2021, 9:52 a.m. UTC
Bump meson required version to 0.49 which is chosen so as to be provided
by 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, 10:11 a.m. UTC | #1
On Tue, Mar 23, 2021 at 10:52:19AM +0100, Gabriel Ganne wrote:
> Bump meson required version to 0.49 which is chosen so as to be provided
> by 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>
> ---
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Andrew Rybchenko March 23, 2021, 10:13 a.m. UTC | #2
On 3/23/21 1:11 PM, Bruce Richardson wrote:
> On Tue, Mar 23, 2021 at 10:52:19AM +0100, Gabriel Ganne wrote:
>> Bump meson required version to 0.49 which is chosen so as to be provided
>> by 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>
>> ---
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> 

Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Thomas Monjalon April 16, 2021, 3:01 p.m. UTC | #3
23/03/2021 11:13, Andrew Rybchenko:
> On 3/23/21 1:11 PM, Bruce Richardson wrote:
> > On Tue, Mar 23, 2021 at 10:52:19AM +0100, Gabriel Ganne wrote:
> >> Bump meson required version to 0.49 which is chosen so as to be provided
> >> by 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>
> >> ---
> > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> 
> Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>

Applied, thanks
Thomas Monjalon April 16, 2021, 5:28 p.m. UTC | #4
16/04/2021 17:01, Thomas Monjalon:
> 23/03/2021 11:13, Andrew Rybchenko:
> > On 3/23/21 1:11 PM, Bruce Richardson wrote:
> > > On Tue, Mar 23, 2021 at 10:52:19AM +0100, Gabriel Ganne wrote:
> > >> Bump meson required version to 0.49 which is chosen so as to be provided
> > >> by 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>
> > >> ---
> > > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> > 
> > Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> 
> Applied, thanks

David reported to me that Bruce did an interesting comment
in the thread of the v1:
https://inbox.dpdk.org/dev/20210401110911.GA1627@bricha3-MOBL.ger.corp.intel.com/

So I've changed the version from 0.49 to 0.49.2.

Hope there will be no issue.
Bruce Richardson April 19, 2021, 8:42 a.m. UTC | #5
On Fri, Apr 16, 2021 at 07:28:57PM +0200, Thomas Monjalon wrote:
> 16/04/2021 17:01, Thomas Monjalon:
> > 23/03/2021 11:13, Andrew Rybchenko:
> > > On 3/23/21 1:11 PM, Bruce Richardson wrote:
> > > > On Tue, Mar 23, 2021 at 10:52:19AM +0100, Gabriel Ganne wrote:
> > > >> Bump meson required version to 0.49 which is chosen so as to be provided
> > > >> by 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>
> > > >> ---
> > > > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> > > 
> > > Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
> > 
> > Applied, thanks
> 
> David reported to me that Bruce did an interesting comment
> in the thread of the v1:
> https://inbox.dpdk.org/dev/20210401110911.GA1627@bricha3-MOBL.ger.corp.intel.com/
> 
> So I've changed the version from 0.49 to 0.49.2.
> 
> Hope there will be no issue.
> 
I would not expect so. Thanks for fixing it up on apply.
diff mbox series

Patch

diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh
index 5d3089cadd62..eb6fc69c9c67 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'
 
 # 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..f6ea29d47a4a 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+) 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..d01166e8d27b 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 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..d4a1fff429ff 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 (baseline) or the latest release.
 
 Install the Backend
 -------------------
diff --git a/meson.build b/meson.build
index 7778e18200a9..0a232c2676e0 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'
 )
 
 # set up some global vars for compiler, platform, configuration, etc.