From d23d6fde81b3a8bf701d0382d55fe60e2334c934 Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Thu, 8 Dec 2022 21:03:40 +0100 Subject: [PATCH] package/pkg-meson.mk: add 'setup' as meson command in config step When building/configure meson packages the following warning is displayed: WARNING: Running the setup command as meson [options] instead of meson setup [options] is ambiguous and deprecated. This warning was introduced in meson release 0.64.0 [0], which we are using since commit 9afa3e3c7d07 (package/meson: bump to version 0.64.0), and is dpcumented in the manual [1]. Follow the advise and the manual, and add the 'setup' argument as the meson command. [0] https://github.com/mesonbuild/meson/commit/3c7ab542c0c4770241eae149b0d4cd8de329aee0 [1] https://mesonbuild.com/Commands.html#setup Signed-off-by: Heiko Thiery Signed-off-by: Yann E. MORIN --- package/pkg-meson.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index d675f7f733..4aa6e44afa 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -149,7 +149,7 @@ define $(2)_CONFIGURE_CMDS CC_FOR_BUILD="$$(HOSTCC)" \ CXX_FOR_BUILD="$$(HOSTCXX)" \ $$($$(PKG)_CONF_ENV) \ - $$(MESON) \ + $$(MESON) setup \ --prefix=/usr \ --libdir=lib \ --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ @@ -169,7 +169,7 @@ define $(2)_CONFIGURE_CMDS rm -rf $$($$(PKG)_SRCDIR)/build mkdir -p $$($$(PKG)_SRCDIR)/build $$(HOST_CONFIGURE_OPTS) \ - $$($$(PKG)_CONF_ENV) $$(MESON) \ + $$($$(PKG)_CONF_ENV) $$(MESON) setup \ --prefix=$$(HOST_DIR) \ --libdir=lib \ --sysconfdir=$$(HOST_DIR)/etc \