Date: Tue, 28 Apr 2026 18:26:22 +0000 From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 70718cbf1b00 - main - Mk/Uses/meson.mk: Silence warning during do-configure stage Message-ID: <69f0fbce.202f4.25de3156@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=70718cbf1b0089043c9278c6b5f578fadcdf9b9d commit 70718cbf1b0089043c9278c6b5f578fadcdf9b9d Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2026-04-28 18:09:42 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2026-04-28 18:22:33 +0000 Mk/Uses/meson.mk: Silence warning during do-configure stage Add setup to CONFIGURE_ARGS to silence following warning: "WARNING: Running the setup command as `meson [options]` instead of `meson setup [options]` is ambiguous and deprecated." While at it add a safeguard when CONFIGURE_ARGS is used instead of MESON_ARGS PR: 294808 Reviewed by: desktop (arrowd), previous interation --- Mk/Uses/meson.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk index f1b41cbdbceb..3a5aa9d7eba9 100644 --- a/Mk/Uses/meson.mk +++ b/Mk/Uses/meson.mk @@ -25,13 +25,17 @@ _INCLUDE_USES_MESON_MK= yes _valid_ARGS= muon -# Sanity check +# Sanity checks . for _arg in ${meson_ARGS} . if empty(_valid_ARGS:M${_arg}) IGNORE= 'USES+= meson:${meson_ARGS}' usage: argument [${_arg}] is not recognized . endif . endfor +. if defined(CONFIGURE_ARGS) +IGNORE= Please use MESON_ARGS instead of CONFIGURE_ARGS for Meson based ports +. endif + . if !empty(meson_ARGS:Mmuon) BUILD_DEPENDS+= muon:devel/muon . else @@ -49,7 +53,8 @@ USE_LOCALE?= en_US.UTF-8 CONFIGURE_ARGS+= meson . endif -CONFIGURE_ARGS+= --prefix ${PREFIX} \ +CONFIGURE_ARGS+= setup \ + --prefix ${PREFIX} \ --localstatedir /var \ --infodir ${INFO_PATH}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f0fbce.202f4.25de3156>