Skip to content

Commit

Permalink
build: update minimum required Meson version
Browse files Browse the repository at this point in the history
Bump Meson required version to 0.49.2 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 <[email protected]>
Acked-by: Bruce Richardson <[email protected]>
Acked-by: Andrew Rybchenko <[email protected]>
  • Loading branch information
Gabriel Ganne authored and tmonjalo committed Apr 16, 2021
1 parent 3ea6ee3 commit 8c10530
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .ci/linux-setup.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/guides/linux_gsg/sys_reqs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion doc/guides/prog_guide/build-sdk-meson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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".

Expand Down
2 changes: 1 addition & 1 deletion doc/guides/windows_gsg/build_dpdk.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------------
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)

# check for developer mode
Expand Down

0 comments on commit 8c10530

Please sign in to comment.