[PATCH v2] doc: avoid meson deprecation in setup

Stanisław Kardach kda at semihalf.com
Tue Nov 22 13:00:19 CET 2022
Previous message (by thread): [PATCH v2] doc: avoid meson deprecation in setup
Next message (by thread): [PATCH v2] doc: avoid meson deprecation in setup
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On Tue, Nov 22, 2022 at 12:38 PM David Marchand
<david.marchand at redhat.com> wrote:
>
> From: Stephen Hemminger <stephen at networkplumber.org>
>
> 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 <stephen at networkplumber.org>
> Acked-by: Bruce Richardson <bruce.richardson at intel.com>
> Acked-by: Zhangfei Gao <zhangfei.gao at linaro.org>
> Signed-off-by: David Marchand <david.marchand at redhat.com>
> ---
> Changes since v1:
> - fixed commitlog,
> - dropped unrelated changes (and sometimes broken),
> - fixed all (I am probably too optimistic) other occurences in the doc,
>
> ---
>  doc/guides/cryptodevs/armv8.rst               |  2 +-
>  doc/guides/cryptodevs/bcmfs.rst               |  2 +-
>  doc/guides/cryptodevs/uadk.rst                |  2 +-
>  doc/guides/freebsd_gsg/build_dpdk.rst         |  2 +-
>  doc/guides/gpus/cuda.rst                      |  6 +--
>  doc/guides/howto/openwrt.rst                  |  2 +-
>  doc/guides/linux_gsg/build_dpdk.rst           |  8 ++--
>  .../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 +-
>  doc/guides/nics/ark.rst                       |  2 +-
>  doc/guides/nics/mvneta.rst                    |  2 +-
>  doc/guides/nics/mvpp2.rst                     |  2 +-
>  doc/guides/platform/bluefield.rst             |  4 +-
>  doc/guides/platform/cnxk.rst                  |  8 ++--
>  doc/guides/platform/octeontx.rst              |  8 ++--
>  doc/guides/prog_guide/build-sdk-meson.rst     | 39 +++++++++++--------
>  doc/guides/prog_guide/lto.rst                 |  2 +-
>  doc/guides/prog_guide/profile_app.rst         |  4 +-
>  .../sample_app_ug/vm_power_management.rst     |  4 +-
>  doc/guides/windows_gsg/build_dpdk.rst         |  4 +-
>  21 files changed, 63 insertions(+), 58 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 <DPDK-source-directory>
> -    meson <dest-dir> --cross-file config/arm/arm64_stingray_linux_gcc
> +    meson setup <dest-dir> --cross-file config/arm/arm64_stingray_linux_gcc
>      cd <dest-dir>
>      ninja
>
> 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
> diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst
> index d335b97cfc..514d18c870 100644
> --- a/doc/guides/freebsd_gsg/build_dpdk.rst
> +++ b/doc/guides/freebsd_gsg/build_dpdk.rst
> @@ -44,7 +44,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/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.
> 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 4f2def15ed..bbd2efc9d8 100644
> --- a/doc/guides/linux_gsg/build_dpdk.rst
> +++ b/doc/guides/linux_gsg/build_dpdk.rst
> @@ -53,7 +53,7 @@ To configure a DPDK build use:
>
>  .. code-block:: console
>
> -     meson <options> build
> +     meson setup <options> build
>
>  where "build" is the desired output build directory, and "<options>" can be
>  empty or one of a number of meson or DPDK-specific build options, described
> @@ -140,7 +140,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
> @@ -166,12 +166,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 cbe9d171f8..e4de5c8d18 100644
> --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
> +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst
> @@ -167,19 +167,19 @@ Cross Compiling DPDK with GNU toolchain using Meson
>  To cross-compile DPDK on a desired target machine we can use the following
>  command::
>
> -   meson cross-build --cross-file <target_machine_configuration>
> +   meson setup cross-build --cross-file <target_machine_configuration>
>     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=<target_soc>
> +   meson setup soc_build -Dplatform=<target_soc>
>
>  Substitute <target_soc> 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 <target_machine_configuration>
> +   meson setup cross-build --cross-file <target_machine_configuration>
>     ninja -C cross-build
>
>  For example if the target machine is a generic rv64gc RISC-V, use the following
>  command::
>
> -   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
> <snip>
Thanks for fixing this!

Acked-by: Stanislaw Kardach <kda at semihalf.com>

-- 
Best Regards,
Stanisław Kardach
Previous message (by thread): [PATCH v2] doc: avoid meson deprecation in setup
Next message (by thread): [PATCH v2] doc: avoid meson deprecation in setup
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the dev mailing list