cpet
/
freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/mod_php8*: Fix build 

USES=apache must be called before bsd.pre.port.mk however this was
overridden using an include clause. During my previous commit on
refactoring apache.mk these include blocks were deleted which causes
failure to the build of these port as USES=apache in preport.mk is never
called. This commit changes and refactors the code.

Fixes: 40843b1 Mk/Uses/apache.mk: Refactor after removal of older versions
This commit is contained in:
Muhammad Moinur Rahman 2023-01-25 15:10:21 -06:00
parent 58310a68d2
commit 8ea662c5f7
6 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lang/php80/Makefile
View File

@ -88,19 +88,8 @@ ZTS_CONFIGURE_ENV= pthreads_working="yes"
DESTDIRNAME= INSTALL_ROOT
.include <bsd.port.pre.mk>
.if ${ARCH} == riscv64
CONFIGURE_ARGS+=--without-pcre-jit
.endif
.if defined(PKGNAMEPREFIX)
USES+= apache
.if ${PORT_OPTIONS:MAP2FILTER}
CONFIGURE_ARGS+=--with-apxs2filter=${APXS}
.else
CONFIGURE_ARGS+=--with-apxs2=${APXS}
.endif
PLIST= ${PKGDIR}/pkg-plist.mod
PKGMESSAGE= ${PKGDIR}/pkg-message.mod
MODULENAME= libphp
@ -108,6 +97,12 @@ SHORTMODNAME= php
WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
.endif
.include <bsd.port.pre.mk>
.if ${ARCH} == riscv64
CONFIGURE_ARGS+=--without-pcre-jit
.endif
.if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=--enable-phpdbg-debug
.endif

17
lang/php81/Makefile
View File

@ -89,19 +89,8 @@ PHPDBG_VARS= PHP_SAPI+=phpdbg
ZTS_CONFIGURE_ON= --enable-zts
ZTS_CONFIGURE_ENV= pthreads_working="yes"
.include <bsd.port.pre.mk>
.if ${ARCH} == riscv64
CONFIGURE_ARGS+= --without-pcre-jit
.endif
.if defined(PKGNAMEPREFIX)
USES+= apache
.if ${PORT_OPTIONS:MAP2FILTER}
CONFIGURE_ARGS+= --with-apxs2filter=${APXS}
.else
CONFIGURE_ARGS+= --with-apxs2=${APXS}
.endif
PLIST= ${PKGDIR}/pkg-plist.mod
PKGMESSAGE= ${PKGDIR}/pkg-message.mod
MODULENAME= libphp
@ -109,6 +98,12 @@ SHORTMODNAME= php
WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
.endif
.include <bsd.port.pre.mk>
.if ${ARCH} == riscv64
CONFIGURE_ARGS+= --without-pcre-jit
.endif
.if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --enable-phpdbg-debug
.endif

17
lang/php82/Makefile
View File

@ -89,19 +89,8 @@ PHPDBG_VARS= PHP_SAPI+=phpdbg
ZTS_CONFIGURE_ON= --enable-zts
ZTS_CONFIGURE_ENV= pthreads_working="yes"
.include <bsd.port.pre.mk>
.if ${ARCH} == riscv64
CONFIGURE_ARGS+= --without-pcre-jit
.endif
.if defined(PKGNAMEPREFIX)
USES+= apache
.if ${PORT_OPTIONS:MAP2FILTER}
CONFIGURE_ARGS+= --with-apxs2filter=${APXS}
.else
CONFIGURE_ARGS+= --with-apxs2=${APXS}
.endif
PLIST= ${PKGDIR}/pkg-plist.mod
PKGMESSAGE= ${PKGDIR}/pkg-message.mod
MODULENAME= libphp
@ -109,6 +98,12 @@ SHORTMODNAME= php
WARNING= "!!! If you have a threaded Apache, you must build ${PHP_PORT} with ZTS support to enable thread-safety in extensions !!!"
.endif
.include <bsd.port.pre.mk>
.if ${ARCH} == riscv64
CONFIGURE_ARGS+= --without-pcre-jit
.endif
.if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+= --enable-phpdbg-debug
.endif

3
www/mod_php80/Makefile
View File

@ -13,4 +13,7 @@ OPTIONS_EXCLUDE= CGI CLI EMBED FPM
AP2FILTER_DESC= Use Apache 2.x filter interface (experimental)
AP2FILTER_CONFIGURE_ON=--with-apxs2filter=${APXS}
AP2FILTER_CONFIGURE_OFF=--with-apxs2=${APXS}
.include "${MASTERDIR}/Makefile"

3
www/mod_php81/Makefile
View File

@ -13,4 +13,7 @@ OPTIONS_EXCLUDE= CGI CLI EMBED FPM
AP2FILTER_DESC= Use Apache 2.x filter interface (experimental)
AP2FILTER_CONFIGURE_ON=--with-apxs2filter=${APXS}
AP2FILTER_CONFIGURE_OFF=--with-apxs2=${APXS}
.include "${MASTERDIR}/Makefile"

3
www/mod_php82/Makefile
View File

@ -12,4 +12,7 @@ OPTIONS_EXCLUDE= CGI CLI EMBED FPM
AP2FILTER_DESC= Use Apache 2.x filter interface (experimental)
AP2FILTER_CONFIGURE_ON=--with-apxs2filter=${APXS}
AP2FILTER_CONFIGURE_OFF=--with-apxs2=${APXS}
.include "${MASTERDIR}/Makefile"