Date: Wed, 11 Dec 2024 17:34:05 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9df694a48dce - main - www/php84-opcache: fix build on non-amd64 / non-i386 Message-ID: <202412111734.4BBHY5GX028940@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=9df694a48dced4125478aff98b3af12410c8bc6b commit 9df694a48dced4125478aff98b3af12410c8bc6b Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2024-12-09 15:32:03 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2024-12-11 17:28:56 +0000 www/php84-opcache: fix build on non-amd64 / non-i386 post-configure step unconditionally tried to use JIT source, even when JIT was disabled in ports (on aarch64) or in the source (powerpc*, riscv*, armv7), which caused build breakage. This commit checks whether JIT is supported (currently it is only on aarch64, amd64 and i386) and only then uses JIT sources. It also enables JIT on aarch64, which was disabled previously. --- lang/php84/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lang/php84/Makefile b/lang/php84/Makefile index f79e3b788e71..904cee35a0f5 100644 --- a/lang/php84/Makefile +++ b/lang/php84/Makefile @@ -590,11 +590,7 @@ USES+= pkgconfig .include <bsd.port.pre.mk> -.if ${ARCH} == aarch64 && ${PHP_MODNAME} == "opcache" -CONFIGURE_ARGS+=--disable-opcache-jit -.endif - -.if ${PHP_MODNAME} == "opcache" +.if (${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386) && ${PHP_MODNAME} == "opcache" post-configure: @${BSDMAKE} -C ${WRKSRC} ./jit/ir/ir_fold_hash.h @${BSDMAKE} -C ${WRKSRC} ./jit/ir/ir_emit.lo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412111734.4BBHY5GX028940>