From nobody Wed Jan 25 21:14:50 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P2GnQ30cxz3bSH5; Wed, 25 Jan 2023 21:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P2GnQ2Wtkz3wqS; Wed, 25 Jan 2023 21:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674681290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUXDxfxXsvXZEEe2+wYHdA/oniQdWHZn7OvC8shqI9s=; b=CQ+SQBaem14R534UyXdDGATiKmOmO9bJeTZjxMGzuiB3egFjQojbzI9smmlecdsS0LfhK3 JCs6YphaLZiJa7FrGIQ0eq54MD6X1TlcwJX6+AOo1Nz8eLL3Ff/FdmeG+3AtKAW9GL6WD6 hQXDQeIyvJKdIubvadGbh/2HxowrH2uujQHhpImD/LcMrYjReF6n8k7fCpq+WNx3j2Zywj Jn3ED32WBabRglYmZr3p5HHo3V6gx4To9zoFShiDPFVCPE4ZHXzTMVCv9HaIEjlcfFosHU MciMTIAvgxa5ngxtQClPMmCr5NPOYNd4IKjPqujF27jShWylNMgCRTroEX5y9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674681290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CUXDxfxXsvXZEEe2+wYHdA/oniQdWHZn7OvC8shqI9s=; b=IsaC2xmGkowH3KtJ3QoMdez9HQy8H9vjUG8y+kGvm4dUyLUIgnRcGcYE+qwD1JsaSPy99i RdPCouUIu2NqVE3ktlSPumbns8gODFiT+DhOkzExRhAZf/X3ASgdREoeYm8WPD00dC4gGC DaV9Uzy+qJPRxwDoAyCYc7Ojr8c956KPG66sJM6q91JzcgBt75TS8Fq3lD9EorI9+x+5t1 SkEXqhot7N7/77RSi2FIpQX/Hs8qjXk+R1wvOPU1nxhLbJmZgVJEQeA8QSEgx6P5PRhQdg SEA4ZqTQv+G1cNmVcY0iL1p457M+gpTqk7OWNXqDA/Oyjkei3VFJh3FnhXhdug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674681290; a=rsa-sha256; cv=none; b=ToEQxOkG3kKoa+5J/ecA1eYsbb9zjPSBiAL1iLwgKQb73IKvbfmOteN2k0yV5smw8QgSzU XUY3m7PTXbP2aMClys8Vrl1p7t32jQNAQ5ktR5wiCjb8AjO94g+cS2ww9GSf4TNRxEHKrZ SBSxRi+MZ8aCf5SQiPbMU8CTTnuYMsIDhvKsw5I21v+LmIIMMlMG4H1cYMSDkJN3I394j6 uNIhw+NVtjUoWrOr63tX2ZDX2Fg9P9Bank7n34eFxTuQJKJV3m/SSEBBTW1SkEifr7gu/a ZcDyRJ4mTpEFbJ8CUmSy7IhcmYQU5oljGFzTF6QZrWiGhg/VspoHR1dIzxha6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P2GnQ1ZSJz13bD; Wed, 25 Jan 2023 21:14:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30PLEok0078458; Wed, 25 Jan 2023 21:14:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PLEodF078457; Wed, 25 Jan 2023 21:14:50 GMT (envelope-from git) Date: Wed, 25 Jan 2023 21:14:50 GMT Message-Id: <202301252114.30PLEodF078457@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 8ea662c5f716 - main - www/mod_php8*: Fix build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ea662c5f71699443c369821319d211bd91f5901 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=8ea662c5f71699443c369821319d211bd91f5901 commit 8ea662c5f71699443c369821319d211bd91f5901 Author: Muhammad Moinur Rahman AuthorDate: 2023-01-25 21:10:21 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-01-25 21:13:29 +0000 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 --- lang/php80/Makefile | 17 ++++++----------- lang/php81/Makefile | 17 ++++++----------- lang/php82/Makefile | 17 ++++++----------- www/mod_php80/Makefile | 3 +++ www/mod_php81/Makefile | 3 +++ www/mod_php82/Makefile | 3 +++ 6 files changed, 27 insertions(+), 33 deletions(-) diff --git a/lang/php80/Makefile b/lang/php80/Makefile index 85486b348290..3a0079fc8c43 100644 --- a/lang/php80/Makefile +++ b/lang/php80/Makefile @@ -88,19 +88,8 @@ ZTS_CONFIGURE_ENV= pthreads_working="yes" DESTDIRNAME= INSTALL_ROOT -.include - -.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 + +.if ${ARCH} == riscv64 +CONFIGURE_ARGS+=--without-pcre-jit +.endif + .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+=--enable-phpdbg-debug .endif diff --git a/lang/php81/Makefile b/lang/php81/Makefile index af232eed7af0..d84a3e179501 100644 --- a/lang/php81/Makefile +++ b/lang/php81/Makefile @@ -89,19 +89,8 @@ PHPDBG_VARS= PHP_SAPI+=phpdbg ZTS_CONFIGURE_ON= --enable-zts ZTS_CONFIGURE_ENV= pthreads_working="yes" -.include - -.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 + +.if ${ARCH} == riscv64 +CONFIGURE_ARGS+= --without-pcre-jit +.endif + .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-phpdbg-debug .endif diff --git a/lang/php82/Makefile b/lang/php82/Makefile index ae4cdc3c2c66..bbceb4d67248 100644 --- a/lang/php82/Makefile +++ b/lang/php82/Makefile @@ -89,19 +89,8 @@ PHPDBG_VARS= PHP_SAPI+=phpdbg ZTS_CONFIGURE_ON= --enable-zts ZTS_CONFIGURE_ENV= pthreads_working="yes" -.include - -.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 + +.if ${ARCH} == riscv64 +CONFIGURE_ARGS+= --without-pcre-jit +.endif + .if ${PORT_OPTIONS:MPHPDBG} && ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-phpdbg-debug .endif diff --git a/www/mod_php80/Makefile b/www/mod_php80/Makefile index 8ca5af8db5f6..6b5651434f38 100644 --- a/www/mod_php80/Makefile +++ b/www/mod_php80/Makefile @@ -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" diff --git a/www/mod_php81/Makefile b/www/mod_php81/Makefile index b5c0cfd961a2..82d7543e42b3 100644 --- a/www/mod_php81/Makefile +++ b/www/mod_php81/Makefile @@ -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" diff --git a/www/mod_php82/Makefile b/www/mod_php82/Makefile index a32582b36c28..723a425618b4 100644 --- a/www/mod_php82/Makefile +++ b/www/mod_php82/Makefile @@ -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"