From patchwork Mon Mar 22 14:06:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Ganne X-Patchwork-Id: 89637 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E6619A034F; Mon, 22 Mar 2021 15:06:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7326640040; Mon, 22 Mar 2021 15:06:18 +0100 (CET) Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by mails.dpdk.org (Postfix) with ESMTP id 442324003D for ; Mon, 22 Mar 2021 15:06:17 +0100 (CET) Received: from localhost (unknown [10.16.0.62]) by proxy.6wind.com (Postfix) with ESMTP id 2C463914819; Mon, 22 Mar 2021 15:06:17 +0100 (CET) From: Gabriel Ganne To: Aaron Conole , Michael Santana , Dmitry Kozlyuk , Narcisa Ana Maria Vasile , Dmitry Malloy , Pallavi Kadam , Bruce Richardson Cc: dev@dpdk.org, olivier.matz@6wind.com, thierry.herbelot@6wind.com, Gabriel Ganne Date: Mon, 22 Mar 2021 15:06:07 +0100 Message-Id: <20210322140609.7564-1-gabriel.ganne@6wind.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 1/3] meson: fix minimum required meson version X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- .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 --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.