Re: git: 3b4c86ee5819 - main - www/php84-opcache: Unbreak

Hello!

On 03.08.2024 00:48, Muhammad Moinur Rahman wrote:
> The branch main has been updated by bofh:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=3b4c86ee58196188132b244feb893ea2864f704f
> 
> commit 3b4c86ee58196188132b244feb893ea2864f704f
> Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
> AuthorDate: 2024-08-02 21:47:45 +0000
> Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
> CommitDate: 2024-08-02 21:47:45 +0000
> 
>      www/php84-opcache: Unbreak
> ---
>   lang/php84/Makefile        | 9 ++++++++-
>   www/php84-opcache/Makefile | 2 --
>   2 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/lang/php84/Makefile b/lang/php84/Makefile
> index 795124262385..b2d4ea5987db 100644
> --- a/lang/php84/Makefile
> +++ b/lang/php84/Makefile

> @@ -593,6 +594,12 @@ USES+=			pkgconfig
>   CONFIGURE_ARGS+=--disable-opcache-jit
>   .endif
>   
> +.if ${PHP_MODNAME} == "opcache"
> +post-configure:
> +	@${BSDMAKE} -C ${WRKSRC} ./jit/ir/ir_fold_hash.h
> +	@${BSDMAKE} -C ${WRKSRC} ./jit/ir/ir_emit.lo
> +.endif
> +

On arch64 opcache-jit are always disabled (however, https://github.com/php/php-src/pull/12813 seem to be fixed it and we need to retest jit usage) and this construction fails to build.


Need to slightly modify it to skip manual jit handling on aarch64

-.if ${PHP_MODNAME} == "opcache"
+.if ${PHP_MODNAME} == "opcache" && ${ARCH} != aarch64




-- 
Sincerely,
Dima (fluffy@FreeBSD.org, https://t.me/FluffyBSD, @fluffy:matrix-dev.freebsd.org)
(desktop, kde, x11, office, ports-secteam)@FreeBSD team