From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DECD2A06CB for ; Tue, 22 Nov 2022 23:03:42 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D49C842D79; Tue, 22 Nov 2022 23:03:42 +0100 (CET) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id DBD4942D7E for ; Tue, 22 Nov 2022 23:03:39 +0100 (CET) Received: by mail-wm1-f43.google.com with SMTP id j5-20020a05600c410500b003cfa9c0ea76so90308wmi.3 for ; Tue, 22 Nov 2022 14:03:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zOeOGzpINHnq7Jhh/F9+L35/CrHYZKK3UusSkIcwxAQ=; b=FzzRB7QHqbGv1BtZgzgJaY5U6zu6/lw63YhbrXy+eTEnSDBPE+oQyvBNuEx3cYHr/K FNZSkqN6fyJffawRc0n2ZZEQhoG+vomwLl+H82C7M/Rp4A5z96OSulzGTKM1XaVQxkwA g50e/Yf01DFujwpqzEH357UjO3Ym5MKhUXZ/PR2Ajk2Lo027u1svT7xGp30JpL2hXtvu obYVslJnwjazS2c8i/2cMSvWDwQQl0/NcV1dIkglkOL6YUC4u92cptAeVcZ7XZC+7eun 7jio7HhW6P+S1bRaCDLFvANc2z+IMQZ0bPd+2hyIjaH/7dJ1t2Dzxl755Zp4/ycbsPda X7tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zOeOGzpINHnq7Jhh/F9+L35/CrHYZKK3UusSkIcwxAQ=; b=MbhdhswUJOSbZKM7WSvWweOVVp3CS/AtCEFDJ/3FocVc6ZB94ya9jWi3xTXxmfSWb1 v6h4nKAgjiD33Kis87o3fowA2dk+d3NvOYGd8xa1ly8JTY7kzgOdssbgVxvCYJsLlYuv QOS8hwSSn04HNIYiI907H0OC+HH9UHEjH0FgpUY2MHZfQFFFbMlHA7vKP+izZTan8KJi w8wsmNclj76eDXJ/LnQfbVFvTNEy6nQ33mGxgg/6Ju6bJ0qDIRw2TLJosxrJxWXnegXN 2J6efhrChrumpDIaUvtnQ1B3s5ZKFFLipZHelDau5lkghRZpG8jEFCmrc/+qIKxKuHrg fIHg== X-Gm-Message-State: ANoB5pk+xm2ESWHMZoxiHatCaFG6iCJu3jJ14TlP1A2fd42eI9LuAyMF hGLTcoSLTlBbKFOTWGRAn44= X-Google-Smtp-Source: AA0mqf6OTy8ZIx52lRiDUTfpQ9YfqX0Xr1xzur75+Dy1hMW+GKMQvQY1+9lzwL4TbOWzU1S1NM1axQ== X-Received: by 2002:a05:600c:4386:b0:3cf:a4a6:a048 with SMTP id e6-20020a05600c438600b003cfa4a6a048mr4399843wmn.202.1669154619479; Tue, 22 Nov 2022 14:03:39 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id x11-20020a5d60cb000000b00241bc4880fesm14064672wrt.111.2022.11.22.14.03.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 14:03:39 -0800 (PST) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: Bruce Richardson , Zhangfei Gao , David Marchand , Stanislaw Kardach , dpdk stable Subject: patch 'doc: avoid meson deprecation in setup' has been queued to stable release 20.11.7 Date: Tue, 22 Nov 2022 22:02:41 +0000 Message-Id: <20221122220241.926784-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122220241.926784-1-luca.boccassi@gmail.com> References: <20221117230859.611465-34-luca.boccassi@gmail.com> <20221122220241.926784-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/73a02ad7e25853971deb192c77ac94390204fe0e Thanks. Luca Boccassi --- >From 73a02ad7e25853971deb192c77ac94390204fe0e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 15 Nov 2022 09:35:16 -0800 Subject: [PATCH] doc: avoid meson deprecation in setup [ upstream commit e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 ] The command "meson build" causes a deprecation warning with meson 0.64.0. WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated. Therefore fix the examples in the documentation. Signed-off-by: Stephen Hemminger Acked-by: Bruce Richardson Acked-by: Zhangfei Gao Signed-off-by: David Marchand Acked-by: Stanislaw Kardach --- doc/guides/cryptodevs/armv8.rst | 2 +- doc/guides/cryptodevs/bcmfs.rst | 2 +- doc/guides/freebsd_gsg/build_dpdk.rst | 2 +- doc/guides/howto/openwrt.rst | 2 +- doc/guides/linux_gsg/build_dpdk.rst | 8 ++-- .../linux_gsg/cross_build_dpdk_for_arm64.rst | 4 +- doc/guides/nics/ark.rst | 2 +- doc/guides/nics/mvneta.rst | 3 +- doc/guides/nics/mvpp2.rst | 3 +- doc/guides/platform/bluefield.rst | 4 +- doc/guides/platform/octeontx.rst | 8 ++-- doc/guides/platform/octeontx2.rst | 4 +- doc/guides/prog_guide/build-sdk-meson.rst | 39 +++++++++++-------- doc/guides/prog_guide/lto.rst | 2 +- doc/guides/prog_guide/profile_app.rst | 2 +- .../sample_app_ug/vm_power_management.rst | 4 +- doc/guides/windows_gsg/build_dpdk.rst | 4 +- 17 files changed, 51 insertions(+), 44 deletions(-) diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index 8963f66a20..1a006754cb 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -47,7 +47,7 @@ To build DPDK with this virtual crypto PMD, the user is required to: .. code-block:: console - meson build + meson setup build ninja -C build The corresponding device can be created only if the following features diff --git a/doc/guides/cryptodevs/bcmfs.rst b/doc/guides/cryptodevs/bcmfs.rst index f5dcd59c87..d18a253913 100644 --- a/doc/guides/cryptodevs/bcmfs.rst +++ b/doc/guides/cryptodevs/bcmfs.rst @@ -70,7 +70,7 @@ for cross compiling on x86 platform. .. code-block:: console cd - meson --cross-file config/arm/arm64_stingray_linux_gcc + meson setup --cross-file config/arm/arm64_stingray_linux_gcc cd ninja diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index e3005a7f3c..1a4c4b88ef 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -41,7 +41,7 @@ Building DPDK The following commands can be used to build and install DPDK on a system. The final, install, step generally needs to be run as root:: - meson build + meson setup build cd build ninja ninja install diff --git a/doc/guides/howto/openwrt.rst b/doc/guides/howto/openwrt.rst index e1d7db2a90..be902c505f 100644 --- a/doc/guides/howto/openwrt.rst +++ b/doc/guides/howto/openwrt.rst @@ -100,7 +100,7 @@ first. ar = 'x86_64-openwrt-linux-ar' strip = 'x86_64-openwrt-linux-strip' - meson builddir --cross-file openwrt-cross + meson setup builddir --cross-file openwrt-cross ninja -C builddir Running DPDK application on OpenWrt diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index f78eef2517..2b3c5826e9 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -42,7 +42,7 @@ To configure a DPDK build use: .. code-block:: console - meson build + meson setup build where "build" is the desired output build directory, and "" can be empty or one of a number of meson or DPDK-specific build options, described @@ -100,7 +100,7 @@ automatically built as part of a meson build too. To do so, pass a comma-separated list of the examples to build to the `-Dexamples` meson option as below:: - meson -Dexamples=l2fwd,l3fwd build + meson setup -Dexamples=l2fwd,l3fwd build As with other meson options, this can also be set post-initial-config using `meson configure` in the build directory. There is also a special value "all" to request that all example applications whose @@ -126,12 +126,12 @@ The following meson command can be used on RHEL/Fedora systems to configure a 32 assuming the relevant 32-bit development packages, such as a 32-bit libc, are installed:: PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig \ - meson -Dc_args='-m32' -Dc_link_args='-m32' build + meson setup -Dc_args='-m32' -Dc_link_args='-m32' build For Debian/Ubuntu systems, the equivalent command is:: PKG_CONFIG_LIBDIR=/usr/lib/i386-linux-gnu/pkgconfig \ - meson -Dc_args='-m32' -Dc_link_args='-m32' build + meson setup -Dc_args='-m32' -Dc_link_args='-m32' build Once the build directory has been configured, DPDK can be compiled using ``ninja`` as described above. diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index 8a1d0e88b0..d9f7915836 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -91,11 +91,11 @@ To install it in Ubuntu:: To cross-compile DPDK on a desired target machine we can use the following command:: - meson cross-build --cross-file + meson setup cross-build --cross-file ninja -C cross-build For example if the target machine is arm64 we can use the following command:: - meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc + meson setup arm64-build --cross-file config/arm/arm64_armv8_linux_gcc ninja -C arm64-build diff --git a/doc/guides/nics/ark.rst b/doc/guides/nics/ark.rst index 18434c7a48..383ab8b79c 100644 --- a/doc/guides/nics/ark.rst +++ b/doc/guides/nics/ark.rst @@ -145,7 +145,7 @@ To build with a non-zero minimum tx packet length, set the above macro in your CFLAGS environment prior to the meson build step. I.e., export CFLAGS="-DRTE_LIBRTE_ARK_MIN_TX_PKTLEN=60" - meson build + meson setup build Supported ARK RTL PCIe Instances diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index 4238b00066..1c36af8f9b 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -114,7 +114,8 @@ following command: .. code-block:: console - meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build + meson setup build --cross-file config/arm/arm64_armada_linux_gcc + ninja -C build Usage Example diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 17e8e347bb..1845508ed8 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -130,7 +130,8 @@ For additional instructions regarding DPDK cross compilation please refer to :do .. code-block:: console - meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build + meson setup build --cross-file config/arm/arm64_armada_linux_gcc + ninja -C build Usage Example diff --git a/doc/guides/platform/bluefield.rst b/doc/guides/platform/bluefield.rst index 824f2bde64..50b74c5e2e 100644 --- a/doc/guides/platform/bluefield.rst +++ b/doc/guides/platform/bluefield.rst @@ -62,7 +62,7 @@ rdma-core library with corresponding kernel drivers is required. .. code-block:: console - meson build + meson setup build ninja -C build Cross Compilation @@ -117,5 +117,5 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. .. code-block:: console - meson build --cross-file config/arm/arm64_bluefield_linux_gcc + meson setup build --cross-file config/arm/arm64_bluefield_linux_gcc ninja -C build diff --git a/doc/guides/platform/octeontx.rst b/doc/guides/platform/octeontx.rst index 42ddb1762e..1459dc7109 100644 --- a/doc/guides/platform/octeontx.rst +++ b/doc/guides/platform/octeontx.rst @@ -94,14 +94,14 @@ drivers can be compiled with the following steps, .. code-block:: console - meson build -Dexamples= + meson setup build -Dexamples= ninja -C build The example applications can be compiled using the following: .. code-block:: console - meson build -Dexamples= + meson setup build -Dexamples= ninja -C build Cross Compilation @@ -127,7 +127,7 @@ Now this build system can be used to build applications for **OCTEON TX** :sup:` .. code-block:: console cd - meson build --cross-file config/arm/arm64_thunderx_linux_gcc + meson setup build --cross-file config/arm/arm64_thunderx_linux_gcc ninja -C build The example applications can be compiled using the following: @@ -135,7 +135,7 @@ The example applications can be compiled using the following: .. code-block:: console cd - meson build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples= + meson setup build --cross-file config/arm/arm64_thunderx_linux_gcc -Dexamples= ninja -C build .. note:: diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst index 8b5991f03b..69925f5fae 100644 --- a/doc/guides/platform/octeontx2.rst +++ b/doc/guides/platform/octeontx2.rst @@ -505,7 +505,7 @@ Native Compilation .. code-block:: console - meson build + meson setup build ninja -C build Cross Compilation @@ -515,7 +515,7 @@ Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 detail .. code-block:: console - meson build --cross-file config/arm/arm64_octeontx2_linux_gcc + meson setup build --cross-file config/arm/arm64_octeontx2_linux_gcc ninja -C build .. note:: diff --git a/doc/guides/prog_guide/build-sdk-meson.rst b/doc/guides/prog_guide/build-sdk-meson.rst index 3429e26479..db25f76aef 100644 --- a/doc/guides/prog_guide/build-sdk-meson.rst +++ b/doc/guides/prog_guide/build-sdk-meson.rst @@ -9,7 +9,7 @@ Summary For many platforms, compiling and installing DPDK should work using the following set of commands:: - meson build + meson setup build cd build ninja ninja install @@ -51,12 +51,12 @@ Configuring the Build ---------------------- To configure a build, run the meson tool, passing the path to the directory -to be used for the build e.g. ``meson build``, as shown above. If calling +to be used for the build e.g. ``meson setup build``, as shown above. If calling meson from somewhere other than the root directory of the DPDK project the path to the root directory should be passed as the first parameter, and the build path as the second. For example, to build DPDK in /tmp/dpdk-build:: - user@host:/tmp$ meson ~user/dpdk dpdk-build + user@host:/tmp$ meson setup ~user/dpdk dpdk-build Meson will then configure the build based on settings in the project's meson.build files, and by checking the build environment for e.g. compiler @@ -74,24 +74,29 @@ available run ``meson configure`` in the build directory. Examples of adjusting the defaults when doing initial meson configuration. Project-specific options are passed used -Doption=value:: - meson --werror werrorbuild # build with warnings as errors + # build with warnings as errors + meson setup --werror werrorbuild - meson --buildtype=debug debugbuild # build for debugging + # build for debugging + meson setup --buildtype=debug debugbuild - meson -Dexamples=l3fwd,l2fwd fwdbuild # build some examples as - # part of the normal DPDK build + # build some examples as part of the normal DPDK build + meson setup -Dexamples=l3fwd,l2fwd fwdbuild - meson -Dmax_lcores=8 smallbuild # scale build for smaller systems + # scale build for smaller systems + meson setup -Dmax_lcores=8 smallbuild - meson -Denable_docs=true fullbuild # build and install docs + # build and install docs + meson setup -Denable_docs=true fullbuild - meson -Dmachine=default # use builder-independent baseline -march + # use builder-independent baseline -march + meson setup -Dcpu_instruction_set=generic - meson -Ddisable_drivers=event/*,net/tap # disable tap driver and all - # eventdev PMDs for a smaller build + # disable tap driver and all eventdev PMDs for a smaller build + meson setup -Ddisable_drivers=event/*,net/tap - meson -Denable_trace_fp=true tracebuild # build with fast path traces - # enabled + # build with fast path traces enabled + meson setup -Denable_trace_fp=true tracebuild Examples of setting some of the same options using meson configure:: @@ -121,7 +126,7 @@ As well as those settings taken from ``meson configure``, other options such as the compiler to use can be passed via environment variables. For example:: - CC=clang meson clang-build + CC=clang meson setup clang-build .. note:: @@ -174,12 +179,12 @@ Cross Compiling DPDK To cross-compile DPDK on a desired target machine we can use the following command:: - meson cross-build --cross-file + meson setup cross-build --cross-file For example if the target machine is arm64 we can use the following command:: - meson arm-build --cross-file config/arm/arm64_armv8_linux_gcc + meson setup arm-build --cross-file config/arm/arm64_armv8_linux_gcc where config/arm/arm64_armv8_linux_gcc contains settings for the compilers and other build tools to be used, as well as characteristics of the target diff --git a/doc/guides/prog_guide/lto.rst b/doc/guides/prog_guide/lto.rst index f79c449598..ff9f47a8f4 100644 --- a/doc/guides/prog_guide/lto.rst +++ b/doc/guides/prog_guide/lto.rst @@ -30,4 +30,4 @@ Link time optimization can be enabled by setting meson built-in 'b_lto' option: .. code-block:: console - meson build -Db_lto=true + meson setup build -Db_lto=true diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst index 52f85bb9e0..44cdee31a7 100644 --- a/doc/guides/prog_guide/profile_app.rst +++ b/doc/guides/prog_guide/profile_app.rst @@ -42,7 +42,7 @@ and recompile the DPDK: .. code-block:: console - meson build + meson setup build meson configure build -Dc_args=-DRTE_ETHDEV_PROFILE_WITH_VTUNE ninja -C build diff --git a/doc/guides/sample_app_ug/vm_power_management.rst b/doc/guides/sample_app_ug/vm_power_management.rst index 9ce87956c9..e0af729e66 100644 --- a/doc/guides/sample_app_ug/vm_power_management.rst +++ b/doc/guides/sample_app_ug/vm_power_management.rst @@ -255,7 +255,7 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console cd dpdk - meson build + meson setup build cd build ninja meson configure -Dexamples=vm_power_manager @@ -494,7 +494,7 @@ To build just the ``vm_power_manager`` application using ``meson``/``ninja``: .. code-block:: console cd dpdk - meson build + meson setup build cd build ninja meson configure -Dexamples=vm_power_manager/guest_cli diff --git a/doc/guides/windows_gsg/build_dpdk.rst b/doc/guides/windows_gsg/build_dpdk.rst index 5f1395f3d4..f8b7c7acde 100644 --- a/doc/guides/windows_gsg/build_dpdk.rst +++ b/doc/guides/windows_gsg/build_dpdk.rst @@ -100,7 +100,7 @@ To compile the examples, the flag ``-Dexamples`` is required. .. code-block:: console cd C:\Users\me\dpdk - meson -Dexamples=helloworld build + meson setup -Dexamples=helloworld build ninja -C build Option 2. Cross-Compile with MinGW-w64 @@ -111,5 +111,5 @@ Depending on the distribution, paths in this file may need adjustments. .. code-block:: console - meson --cross-file config/x86/cross-mingw -Dexamples=helloworld build + meson setup --cross-file config/x86/cross-mingw -Dexamples=helloworld build ninja -C build -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-22 22:01:32.636259641 +0000 +++ 0017-doc-avoid-meson-deprecation-in-setup.patch 2022-11-22 22:01:31.551525496 +0000 @@ -1 +1 @@ -From e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 Mon Sep 17 00:00:00 2001 +From 73a02ad7e25853971deb192c77ac94390204fe0e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e24b8ad46b2124d09a97d2f9e911ba197b4f83d1 ] + @@ -13,2 +14,0 @@ -Cc: stable@dpdk.org - @@ -23 +22,0 @@ - doc/guides/cryptodevs/uadk.rst | 2 +- @@ -25 +23,0 @@ - doc/guides/gpus/cuda.rst | 6 +-- @@ -28,3 +26 @@ - .../linux_gsg/cross_build_dpdk_for_arm64.rst | 12 +++--- - .../cross_build_dpdk_for_loongarch.rst | 2 +- - .../linux_gsg/cross_build_dpdk_for_riscv.rst | 4 +- + .../linux_gsg/cross_build_dpdk_for_arm64.rst | 4 +- @@ -32,2 +28,2 @@ - doc/guides/nics/mvneta.rst | 2 +- - doc/guides/nics/mvpp2.rst | 2 +- + doc/guides/nics/mvneta.rst | 3 +- + doc/guides/nics/mvpp2.rst | 3 +- @@ -35 +30,0 @@ - doc/guides/platform/cnxk.rst | 8 ++-- @@ -36,0 +32 @@ + doc/guides/platform/octeontx2.rst | 4 +- @@ -39 +35 @@ - doc/guides/prog_guide/profile_app.rst | 4 +- + doc/guides/prog_guide/profile_app.rst | 2 +- @@ -42 +38 @@ - 21 files changed, 63 insertions(+), 58 deletions(-) + 17 files changed, 51 insertions(+), 44 deletions(-) @@ -70,13 +65,0 @@ -diff --git a/doc/guides/cryptodevs/uadk.rst b/doc/guides/cryptodevs/uadk.rst -index 1325eaca3f..9af6b88a5a 100644 ---- a/doc/guides/cryptodevs/uadk.rst -+++ b/doc/guides/cryptodevs/uadk.rst -@@ -87,7 +87,7 @@ Test steps - - cd dpdk - mkdir build -- meson build (--reconfigure) -+ meson setup build (--reconfigure) - cd build - ninja - sudo ninja install @@ -84 +67 @@ -index d335b97cfc..514d18c870 100644 +index e3005a7f3c..1a4c4b88ef 100644 @@ -87 +70 @@ -@@ -44,7 +44,7 @@ Building DPDK +@@ -41,7 +41,7 @@ Building DPDK @@ -96,24 +78,0 @@ -diff --git a/doc/guides/gpus/cuda.rst b/doc/guides/gpus/cuda.rst -index 55fc7d1e86..114e3bc8cb 100644 ---- a/doc/guides/gpus/cuda.rst -+++ b/doc/guides/gpus/cuda.rst -@@ -24,8 +24,8 @@ You need to indicate to meson where CUDA headers files are through the CFLAGS va - Three ways: - - - Set ``export CFLAGS=-I/usr/local/cuda/include`` before building --- Add CFLAGS in the meson command line ``CFLAGS=-I/usr/local/cuda/include meson build`` --- Add the ``-Dc_args`` in meson command line ``meson build -Dc_args=-I/usr/local/cuda/include`` -+- Add CFLAGS in the meson command line ``CFLAGS=-I/usr/local/cuda/include meson setup build`` -+- Add the ``-Dc_args`` in meson command line ``meson setup build -Dc_args=-I/usr/local/cuda/include`` - - If headers are not found, the CUDA GPU driver library is not built. - -@@ -51,7 +51,7 @@ An example would be: - - .. code-block:: console - -- $ meson build -Dc_args="-I/usr/local/cuda/include -I/path/to/gdrcopy/include" -+ $ meson setup build -Dc_args="-I/usr/local/cuda/include -I/path/to/gdrcopy/include" - - If headers are not found, the CUDA GPU driver library is built without the CPU map capability - and will return error if the application invokes the gpudev ``rte_gpu_mem_cpu_map`` function. @@ -134 +93 @@ -index 4f2def15ed..bbd2efc9d8 100644 +index f78eef2517..2b3c5826e9 100644 @@ -137 +96 @@ -@@ -53,7 +53,7 @@ To configure a DPDK build use: +@@ -42,7 +42,7 @@ To configure a DPDK build use: @@ -146 +105 @@ -@@ -140,7 +140,7 @@ automatically built as part of a meson build too. +@@ -100,7 +100,7 @@ automatically built as part of a meson build too. @@ -155 +114 @@ -@@ -166,12 +166,12 @@ The following meson command can be used on RHEL/Fedora systems to configure a 32 +@@ -126,12 +126,12 @@ The following meson command can be used on RHEL/Fedora systems to configure a 32 @@ -171 +130 @@ -index cbe9d171f8..e4de5c8d18 100644 +index 8a1d0e88b0..d9f7915836 100644 @@ -174 +133 @@ -@@ -167,19 +167,19 @@ Cross Compiling DPDK with GNU toolchain using Meson +@@ -91,11 +91,11 @@ To install it in Ubuntu:: @@ -178,70 +137,3 @@ -- meson cross-build --cross-file -+ meson setup cross-build --cross-file - ninja -C cross-build - - For example if the target machine is aarch64 we can use the following - command, provided the cross file has been modified accordingly:: - -- meson aarch64-build-gcc --cross-file config/arm/arm64_armv8_linux_gcc -+ meson setup aarch64-build-gcc --cross-file config/arm/arm64_armv8_linux_gcc - ninja -C aarch64-build-gcc - - If the target machine is aarch32 we can use the following command, - provided the cross file has been modified accordingly:: - -- meson aarch32-build --cross-file config/arm/arm32_armv8_linux_gcc -+ meson setup aarch32-build --cross-file config/arm/arm32_armv8_linux_gcc - ninja -C aarch32-build - - LLVM/Clang toolchain -@@ -230,7 +230,7 @@ Assuming the file with augmented ``c_args`` and ``c_link_args`` - is named ``arm64_armv8_linux_clang``, - use the following command to cross-compile DPDK for the target machine:: - -- meson aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang -+ meson setup aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang - ninja -C aarch64-build-clang - - Cross Compiling DPDK with LLVM/Clang toolchain using Meson on Ubuntu 18.04 -@@ -247,7 +247,7 @@ On Ubuntu 18.04, these packages are needed: - - Use the following command to cross-compile DPDK for the target machine:: - -- meson aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804 -+ meson setup aarch64-build-clang --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804 - ninja -C aarch64-build-clang - - Building for an aarch64 SoC on an aarch64 build machine -@@ -258,7 +258,7 @@ you don't need a separate cross toolchain, just a different set of - configuration options. To build for an aarch64 SoC, use the -Dplatform meson - option:: - -- meson soc_build -Dplatform= -+ meson setup soc_build -Dplatform= - - Substitute with one of the supported SoCs - -diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst -index 1549cc86d5..7f75960e9e 100644 ---- a/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst -+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_loongarch.rst -@@ -81,7 +81,7 @@ To cross-compile DPDK for generic LoongArch we can use the following command: - - .. code-block:: console - -- meson cross-build --cross-file config/loongarch/loongarch_loongarch64_linux_gcc -+ meson setup cross-build --cross-file config/loongarch/loongarch_loongarch64_linux_gcc - ninja -C cross-build - - Supported cross-compilation targets -diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst -index 9e121645a8..7d7f7ac72b 100644 ---- a/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst -+++ b/doc/guides/linux_gsg/cross_build_dpdk_for_riscv.rst -@@ -68,13 +68,13 @@ Cross Compiling DPDK with GNU toolchain using Meson - - To cross-compile DPDK for a desired target machine use the following command:: - -- meson cross-build --cross-file -+ meson setup cross-build --cross-file - ninja -C cross-build +- meson cross-build --cross-file ++ meson setup cross-build --cross-file + ninja -C cross-build @@ -249 +141 @@ - For example if the target machine is a generic rv64gc RISC-V, use the following + For example if the target machine is arm64 we can use the following @@ -252,5 +144,3 @@ -- meson riscv64-build-gcc --cross-file config/riscv/riscv64_linux_gcc -+ meson setup riscv64-build-gcc --cross-file config/riscv/riscv64_linux_gcc - ninja -C riscv64-build-gcc - - If riscv-gnu-toolchain is used, binary names should be updated to match. Update +- meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc ++ meson setup arm64-build --cross-file config/arm/arm64_armv8_linux_gcc + ninja -C arm64-build @@ -258 +148 @@ -index 591e41799c..ba00f14e80 100644 +index 18434c7a48..383ab8b79c 100644 @@ -261,2 +151,2 @@ -@@ -282,7 +282,7 @@ CFLAGS environment prior to the meson build step. I.e., - .. code-block:: console +@@ -145,7 +145,7 @@ To build with a non-zero minimum tx packet length, set the above macro in your + CFLAGS environment prior to the meson build step. I.e., @@ -271 +161 @@ -index b7f279c3cb..2ee2637a58 100644 +index 4238b00066..1c36af8f9b 100644 @@ -274 +164,2 @@ -@@ -117,7 +117,7 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable. +@@ -114,7 +114,8 @@ following command: + @@ -277,2 +168 @@ - export PKG_CONFIG_PATH=$/lib/pkgconfig/:$PKG_CONFIG_PATH -- meson build --cross-file config/arm/arm64_armada_linux_gcc +- meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build @@ -280 +170 @@ - ninja -C build ++ ninja -C build @@ -282,0 +173 @@ + Usage Example @@ -284 +175 @@ -index e40fed7286..cbfa47afd8 100644 +index 17e8e347bb..1845508ed8 100644 @@ -287 +178 @@ -@@ -133,7 +133,7 @@ Add path to libmusdk.pc in PKG_CONFIG_PATH environment variable. +@@ -130,7 +130,8 @@ For additional instructions regarding DPDK cross compilation please refer to :do @@ -289 +180 @@ - export PKG_CONFIG_PATH=$/lib/pkgconfig/:$PKG_CONFIG_PATH + .. code-block:: console @@ -291 +182 @@ -- meson build --cross-file config/arm/arm64_armada_linux_gcc +- meson -Dlib_musdk_dir=/path/to/musdk build ninja -C build @@ -293 +184 @@ - ninja -C build ++ ninja -C build @@ -295,0 +187 @@ + Usage Example @@ -297 +189 @@ -index 3e3078c85e..09486747b1 100644 +index 824f2bde64..50b74c5e2e 100644 @@ -300 +192 @@ -@@ -61,7 +61,7 @@ rdma-core library with corresponding kernel drivers is required. +@@ -62,7 +62,7 @@ rdma-core library with corresponding kernel drivers is required. @@ -309 +201 @@ -@@ -115,5 +115,5 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. +@@ -117,5 +117,5 @@ Then, untar the tarball at the cross toolchain directory on the x86 host. @@ -316,38 +207,0 @@ -diff --git a/doc/guides/platform/cnxk.rst b/doc/guides/platform/cnxk.rst -index 562ed7d7a6..aadd60b5d4 100644 ---- a/doc/guides/platform/cnxk.rst -+++ b/doc/guides/platform/cnxk.rst -@@ -587,14 +587,14 @@ CN9K: - - .. code-block:: console - -- meson -Dplatform=cn9k build -+ meson setup -Dplatform=cn9k build - ninja -C build - - CN10K: - - .. code-block:: console - -- meson -Dplatform=cn10k build -+ meson setup -Dplatform=cn10k build - ninja -C build - - Cross Compilation -@@ -606,14 +606,14 @@ CN9K: - - .. code-block:: console - -- meson build --cross-file config/arm/arm64_cn9k_linux_gcc -+ meson setup build --cross-file config/arm/arm64_cn9k_linux_gcc - ninja -C build - - CN10K: - - .. code-block:: console - -- meson build --cross-file config/arm/arm64_cn10k_linux_gcc -+ meson setup build --cross-file config/arm/arm64_cn10k_linux_gcc - ninja -C build - - .. note:: @@ -392,0 +247,22 @@ +diff --git a/doc/guides/platform/octeontx2.rst b/doc/guides/platform/octeontx2.rst +index 8b5991f03b..69925f5fae 100644 +--- a/doc/guides/platform/octeontx2.rst ++++ b/doc/guides/platform/octeontx2.rst +@@ -505,7 +505,7 @@ Native Compilation + + .. code-block:: console + +- meson build ++ meson setup build + ninja -C build + + Cross Compilation +@@ -515,7 +515,7 @@ Refer to :doc:`../linux_gsg/cross_build_dpdk_for_arm64` for generic arm64 detail + + .. code-block:: console + +- meson build --cross-file config/arm/arm64_octeontx2_linux_gcc ++ meson setup build --cross-file config/arm/arm64_octeontx2_linux_gcc + ninja -C build + + .. note:: @@ -394 +270 @@ -index 58d9b553a0..5deabbe54c 100644 +index 3429e26479..db25f76aef 100644 @@ -406 +282 @@ -@@ -57,12 +57,12 @@ Configuring the Build +@@ -51,12 +51,12 @@ Configuring the Build @@ -421 +297 @@ -@@ -80,24 +80,29 @@ available run ``meson configure`` in the build directory. +@@ -74,24 +74,29 @@ available run ``meson configure`` in the build directory. @@ -446 +322 @@ -- meson -Dcpu_instruction_set=generic # use builder-independent baseline -march +- meson -Dmachine=default # use builder-independent baseline -march @@ -462 +338 @@ -@@ -135,7 +140,7 @@ As well as those settings taken from ``meson configure``, other options +@@ -121,7 +126,7 @@ As well as those settings taken from ``meson configure``, other options @@ -471 +347 @@ -@@ -188,12 +193,12 @@ Cross Compiling DPDK +@@ -174,12 +179,12 @@ Cross Compiling DPDK @@ -497 +373 @@ -index bd6700ef85..14292d4c25 100644 +index 52f85bb9e0..44cdee31a7 100644 @@ -509,9 +384,0 @@ -@@ -103,7 +103,7 @@ Example: - - .. code-block:: console - -- meson --cross config/arm/arm64_armv8_linux_gcc -Dc_args='-DRTE_ARM_EAL_RDTSC_USE_PMU' build -+ meson setup --cross config/arm/arm64_armv8_linux_gcc -Dc_args='-DRTE_ARM_EAL_RDTSC_USE_PMU' build - - .. warning:: - @@ -541 +408 @@ -index 38b3068d7b..29f2b38feb 100644 +index 5f1395f3d4..f8b7c7acde 100644 @@ -544 +411 @@ -@@ -104,7 +104,7 @@ To compile the examples, the flag ``-Dexamples`` is required. +@@ -100,7 +100,7 @@ To compile the examples, the flag ``-Dexamples`` is required. @@ -553 +420 @@ -@@ -115,5 +115,5 @@ Depending on the distribution, paths in this file may need adjustments. +@@ -111,5 +111,5 @@ Depending on the distribution, paths in this file may need adjustments.