In order to work around some deprecated functions in meson, we need to increase meson version. Increasing to 0.57 to also gain support for other useful features for us in DPDK. Changes of interest to DPDK include:
* Use get_external_property instead of get_cross_property * Ability to use a VERSION file rather than hacking it with scripting * Ability to set built-in options in cross-build files * Ability to set pkg_config_libdir in cross-build files Signed-off-by: Bruce Richardson <bruce.richard...@intel.com> --- .ci/linux-setup.sh | 2 +- doc/guides/linux_gsg/sys_reqs.rst | 2 +- doc/guides/prog_guide/build-sdk-meson.rst | 2 +- meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci/linux-setup.sh b/.ci/linux-setup.sh index 975bf32144..8512a92b21 100755 --- a/.ci/linux-setup.sh +++ b/.ci/linux-setup.sh @@ -4,7 +4,7 @@ [ "$(id -u)" != '0' ] || alias sudo= # need to install as 'root' since some of the unit tests won't run without it -sudo python3 -m pip install --upgrade 'meson==0.53.2' +sudo python3 -m pip install --upgrade 'meson==0.57.0' # 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 9c5282573e..13d632cec7 100644 --- a/doc/guides/linux_gsg/sys_reqs.rst +++ b/doc/guides/linux_gsg/sys_reqs.rst @@ -44,7 +44,7 @@ Compilation of the DPDK * Python 3.6 or later. -* Meson (version 0.53.2+) and ninja +* Meson (version 0.57+) and ninja * ``meson`` & ``ninja-build`` packages in most Linux distributions * If the packaged version is below the minimum version, the latest versions diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst index 93aa1f80e3..fdb5d484fa 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.53.2 or later of meson is +3 ``pip`` tool, e.g. ``pip3 install meson``. Version 0.57 or later of meson is required - if the version packaged is too old, the latest version is generally available from "pip". diff --git a/meson.build b/meson.build index 8b248d4505..69888834b4 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ project('DPDK', 'c', 'default_library=static', 'warning_level=2', ], - meson_version: '>= 0.53.2' + meson_version: '>= 0.57' ) # check for developer mode -- 2.43.0