From: Otto Moerbeek <otto@drijf.net>
Subject: Re: net/dnsdist: tighten up lua handling
To: ports@openbsd.org
Date: Sat, 10 Oct 2026 07:28:51 +0200

On Fri, Oct 09, 2026 at 01:55:37PM +0200, Jeremie Courreges-Anglas wrote:

> 
> Assorted tweaks:
> 
> 1. forcefully use the lua version we depend on.  Else lua-5.4 can get
> picked up and result in a build failure if it gets removed by
> dpb(1)... or a hidden dep if not removed.  I've hit this once, on
> riscv64 which doesn't support luajit.
> 
> 2. drop redundant LIB_DEPENDS entry, MODLUA_LIB_DEPENDS are already
> added a few lines above
> 
> 3. drop workaround for FULLPKGNAME, use the Proper Idiom to prevent
> the lua module from stepping on our toes.
> 
>   jupiler /usr/ports/net/dnsdist$ env FLAVOR=h3 make show=FULLPKGNAME
>   dnsdist-2.1.2p0-h3 
> 
> ok?

My ports foo is very limited, so if it works for you, OK.

 -Otto

> 
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/dnsdist/Makefile,v
> diff -u -p -r1.72 Makefile
> --- Makefile	14 Sep 2026 07:31:29 -0000	1.72
> +++ Makefile	9 Oct 2026 11:38:35 -0000
> @@ -1,6 +1,7 @@
>  COMMENT=		highly DNS-, DoS- and abuse-aware loadbalancer
>  
>  DISTNAME=		dnsdist-2.1.2
> +REVISION=		0
>  EXTRACT_SUFX=		.tar.xz
>  DEBUG_PACKAGES=		${BUILD_PACKAGES}
>  
> @@ -44,9 +45,10 @@ CONFIGURE_ARGS+=	-Dlua=luajit
>  LIB_DEPENDS+=		lang/luajit
>  WANTLIB+=		luajit-5.1
>  .else
> -CONFIGURE_ARGS+=	-Dlua=lua
>  MODULES+=		lang/lua
> +MODLUA_SA=		Yes
>  MODLUA_VERSION=		5.3
> +CONFIGURE_ARGS+=	-Dlua=lua${MODLUA_VERSION}
>  LIB_DEPENDS+=		${MODLUA_LIB_DEPENDS}
>  WANTLIB+=		${MODLUA_WANTLIB}
>  .endif
> @@ -72,19 +74,14 @@ CONFIGURE_ARGS+=	-Dcdb=enabled \
>  
>  BUILD_DEPENDS=		devel/boost \
>  			textproc/py-yaml
> -LIB_DEPENDS+=		${MODLUA_LIB_DEPENDS} \
> -			databases/lmdb \
> +LIB_DEPENDS+=		databases/lmdb \
>  			databases/tinycdb \
>  			net/libfstrm \
>  			security/libsodium \
>  			textproc/re2 \
>  			www/nghttp2
>  
> -
>  .if ${FLAVOR:L:Mh3}
> -
> -# Lua module overrides FULLPKGNAME
> -FULLPKGNAME=		${PKGNAME}-${FLAVOR}
>  CONFIGURE_ARGS+=	-Dtls-libssl-dir="${LOCALBASE}/eboringssl" \
>  			-Dlibcrypto-path="${LOCALBASE}/eboringssl" \
>  			-Dcpp_args=-DDISABLE_OCSP_STAPLING \
> 
> 
> -- 
> jca