Re: git: e70ff172c205 - main - graphics/mesa*: Stop using meson native-file

From: Emmanuel Vadot <manu_at_bidouilliste.com>
Date: Tue, 13 Dec 2022 14:32:51 UTC
On Sat, 10 Dec 2022 19:22:31 +0100
Jan Beich <jbeich@FreeBSD.org> wrote:

> Emmanuel Vadot <manu@FreeBSD.org> writes:
> 
> >     Use BINARY_ALIAS instead, this is cleaner.
> >     While here directly record the deps on libLLVM for packages that
> >     needs it.
> 
> See https://cgit.freebsd.org/ports/commit/?id=b460e08f9365
> mesa-dri may accidentally end up using llvm >= 16 once meson adds
> '-16', '-17', etc. to the suffix list while more than one llvm* package
> is installed.
> 
> To reproduce right now (with meson-0.64.1):
> 1. Lower pinned LLVM_DEFAULT back to 13
> 2. Install llvm13, llvm14, llvm15
> 3. Run "make clean configure"
> 4. Notice "llvm-version:    14.0.6"
> 
> However, meson >= 0.64 supports LLVM_CONFIG variable which allows to
> avoid BINARY_ALIAS (e.g., 6df38243af67).
> 
> diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
> index f45f8d7250ff..b2ac1088bf5d 100644
> --- a/graphics/mesa-dri/Makefile.common
> +++ b/graphics/mesa-dri/Makefile.common
> @@ -85,7 +85,7 @@ BINARY_ALIAS+=	python3=${PYTHON_VERSION}
>  
>  LLVM_DEFAULT=	15
>  BUILD_DEPENDS+=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
> -BINARY_ALIAS+=	llvm-config=llvm-config${LLVM_DEFAULT}
> +CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
>  
>  LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
>  MESON_ARGS+=	-Dllvm=enabled

 Thanks, feel free to commit this.

-- 
Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>