git: 318b1cc930e6 - main - lang/php8[12]: Fix bulk build

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Wed, 12 Apr 2023 12:53:58 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=318b1cc930e6d576fb053ff4acf677ebf7e5ac99

commit 318b1cc930e6d576fb053ff4acf677ebf7e5ac99
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-04-12 12:50:59 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-04-12 12:53:27 +0000

    lang/php8[12]: Fix bulk build
    
    PR:             266175
    Reported by:    fluffy
    Sponsored by:   Bounce Experts
---
 lang/php81/Makefile | 8 ++++----
 lang/php82/Makefile | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lang/php81/Makefile b/lang/php81/Makefile
index d8aa6a3deed3..e25845dbfba2 100644
--- a/lang/php81/Makefile
+++ b/lang/php81/Makefile
@@ -400,12 +400,8 @@ CONFIGURE_ARGS+=	--enable-odbc \
 .if ${PHP_MODNAME} == "opcache"
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
-.if ${ARCH} == aarch64
-CONFIGURE_ARGS+=	--disable-opcache-jit
-.else
 CONFIGURE_ARGS+=	--enable-opcache
 .endif
-.endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
@@ -620,6 +616,10 @@ USES+=			pkgconfig
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == aarch64 && ${PHP_MODNAME} == "opcache"
+CONFIGURE_ARGS+=--disable-opcache-jit
+.endif
+
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
diff --git a/lang/php82/Makefile b/lang/php82/Makefile
index ecbc964bad66..8fa78e0e3e5f 100644
--- a/lang/php82/Makefile
+++ b/lang/php82/Makefile
@@ -401,12 +401,8 @@ CONFIGURE_ARGS+=	--enable-odbc \
 .if ${PHP_MODNAME} == "opcache"
 # This is needed by Zend extensions, keep before everything.
 PHP_MOD_PRIO=		10
-.if ${ARCH} == aarch64
-CONFIGURE_ARGS+=        --disable-opcache-jit
-.else
 CONFIGURE_ARGS+=        --enable-opcache
 .endif
-.endif
 
 .if ${PHP_MODNAME} == "pcntl"
 CONFIGURE_ARGS+=	--enable-pcntl
@@ -622,6 +618,10 @@ USES+=			pkgconfig
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == aarch64 && ${PHP_MODNAME} == "opcache"
+CONFIGURE_ARGS+=--disable-opcache-jit
+.endif
+
 .if ${PHP_MODNAME} == "sqlite3" || ${PHP_MODNAME} == "zlib"
 post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4