On Thu, Jul 24, 2025 at 04:01:02PM +0100, Stuart Henderson wrote:

> On 2025/07/21 15:46, Otto Moerbeek wrote:
> > -CONFIGURE_STYLE=	autoconf

Right

> 
> should patches/patch-configure_ac be removed now?
> 
> > +MODULES+=            devel/cargo
> 
> is rust a hard dep now or is it still optional?
> (not a problem but it will kill a few archs)

If the new yaml config is not enabled, rust isn't needed. But I have
no clue how to formulate: "if cargo is not available, set -Dyaml=no".
I expect -Dyaml=auto to not be that smart.

Any hint?

> 
> >  MODULES+=		lang/lua
> >  MODLUA_VERSION=		5.3
> ..
> > -			--with-lua=lua${MODLUA_VERSION:S/.//} \
> ..
> > +			-Dlua=auto \
> 
> there's nothing to tell meson which lua version to use; currently it
> picks up luajit (if installed) by default, otherwise uses the first of
> 5.3, 5.2, 5.1 that it finds. now, luajit may be the best option anyway
> on those archs where it exists - if so, this would do the trick:
> 
> .include <bsd.port.arch.mk>
> .if ${PROPERTIES:Mluajit}
> CONFIGURE_ARGS=		-Dlua=luajit
> LIB_DEPENDS+=		lang/luajit
> WANTLIB+=		luajit-5.1
> .else
> CONFIGURE_ARGS=		-Dlua=lua
> MODULES+=		lang/lua
> MODLUA_VERSION=		5.3
> LIB_DEPENDS+=		${MODLUA_LIB_DEPENDS}
> WANTLIB+=		${MODLUA_WANTLIB}
> .endif
> 
> if not, then you can most of what you had, but change -Dlua=auto to
> -Dlua=lua.

I'll look into that as well. 

> 
> either way, MODLUA_VERSION will need updating if meson/lua/meson.build
> is later changed to prefer 5.4, the meson build files don't have a way
> to pass it in from args. I would be tempted to put in a safety grep
> in e.g. post-extract to warn if 5.4 is added.
> 
> (looks like curses and m can be dropped from WANTLIB too?)

That would surprise me, as libedit and floating point functions *are*
used.

Thanks, 

	-Otto