Re: git: f2488f960dc8 - main - games/openttd: fix build with LLVM 15 on powerpc*

From: Piotr Kubaj <pkubaj_at_anongoth.pl>
Date: Mon, 20 Mar 2023 15:14:08 UTC
Ah, thanks. I will look at more closely.

On 23-03-19 10:03:32, Jan Beich wrote:
> Piotr Kubaj <pkubaj@FreeBSD.org> writes:
> 
> > The branch main has been updated by pkubaj:
> >
> > URL: https://cgit.FreeBSD.org/ports/commit/?id=f2488f960dc89761a6bd51a036168f737bb99988
> >
> > commit f2488f960dc89761a6bd51a036168f737bb99988
> > Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
> > AuthorDate: 2023-03-18 20:56:23 +0000
> > Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
> > CommitDate: 2023-03-18 20:58:13 +0000
> >
> >     games/openttd: fix build with LLVM 15 on powerpc*
> >     
> >     Use LLVM 16 instead:
> >     Assertion failed: (!KnownValid && "Explicit template arguments?"), function AddOverloadedCallCandidate, file /usr/local/poudriere/jails/main-powerpc64le/usr/src/contrib/llvm-project/clang/lib/Sema/SemaOverload.cpp, line 12672.
> [...]
> > +.if ${ARCH:Mpowerpc*} && ${OSVERSION} > 1400078
> > +USES+=		llvm:min=16
> > +CC=		clang${LLVM_VERSION}
> > +CXX=		clang++${LLVM_VERSION}
> 
> How did you test Clang 16? Clang assertions are only enabled on -CURRENT
> thus don't affect -STABLE, -RELEASE and all devel/llvm* ports. /stable/14
> is scheduled[1] on 2023-05-12 while -CURRENT will switch to Clang 16 in
> a few months.
> 
> [1] https://www.freebsd.org/releases/14.0R/schedule/
> 
> diff --git a/games/openttd/Makefile b/games/openttd/Makefile
> index 48a7d231120e..f891e9bf63ba 100644
> --- a/games/openttd/Makefile
> +++ b/games/openttd/Makefile
> @@ -41,8 +41,8 @@ SERVER_VARS=		USE_RC_SUBR=${PORTNAME}
>  
>  .include <bsd.port.options.mk>
>  
> -.if ${ARCH:Mpowerpc*} && ${OSVERSION} > 1400078
> -USES+=		llvm:min=16
> +.if ${ARCH:Mpowerpc*} && ${_OSRELEASE:M*-CURRENT}
> +USES+=		llvm
>  CC=		clang${LLVM_VERSION}
>  CXX=		clang++${LLVM_VERSION}
>  .else