Re: git: 824bf10c2e68 - main - lang/php84: Fix build with ZTS

From: Dima Panov <fluffy_at_FreeBSD.org>
Date: Wed, 31 Dec 2025 10:52:19 UTC
Hello!


Still fails to build with ZTS enbled due to missed parentheses

diff --git a/lang/php84/Makefile b/lang/php84/Makefile
index edb84ad7ea..9279b6c84a 100644
--- a/lang/php84/Makefile
+++ b/lang/php84/Makefile
@@ -133,7 +133,7 @@ PLIST_SUB+= SAPI_INC=""
  PLIST_SUB+=    SAPI_INC="@comment "
  .  endif

-.  if (${OSVERSION} >= 1500000 && ${SSL_DEFAULT} == base) || (${SSL_DEFAULT:Mopenssl*} && ${OPENSSL_SHLIBVER} >= 15) && empty(PORT_OPTIONS:MZTS)
+.  if ((${OSVERSION} >= 1500000 && ${SSL_DEFAULT} == base) || (${SSL_DEFAULT:Mopenssl*} && ${OPENSSL_SHLIBVER} >= 15)) && empty(PORT_OPTIONS:MZTS)
  CONFIGURE_ARGS+=       --with-openssl-argon2
  .  else
  LIB_DEPENDS+=          libargon2.so:security/libargon2




On 28.12.2025 14:53, Muhammad Moinur Rahman wrote:
> The branch main has been updated by bofh:
> 
> URL: https://cgit.FreeBSD.org/ports/commit/?id=824bf10c2e6852ed6e818abc1d418f3d27fa3134
> 
> commit 824bf10c2e6852ed6e818abc1d418f3d27fa3134
> Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
> AuthorDate: 2025-12-28 11:51:28 +0000
> Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
> CommitDate: 2025-12-28 11:51:28 +0000
> 
>      lang/php84: Fix build with ZTS
> ---
>   lang/php84/Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lang/php84/Makefile b/lang/php84/Makefile
> index 52be4c71184e..edb84ad7ea0a 100644
> --- a/lang/php84/Makefile
> +++ b/lang/php84/Makefile
> @@ -133,7 +133,7 @@ PLIST_SUB+=	SAPI_INC=""
>   PLIST_SUB+=	SAPI_INC="@comment "
>   .  endif
>   
> -.  if (${OSVERSION} >= 1500000 && ${SSL_DEFAULT} == base) || (${SSL_DEFAULT:Mopenssl*} && ${OPENSSL_SHLIBVER} >= 15)
> +.  if (${OSVERSION} >= 1500000 && ${SSL_DEFAULT} == base) || (${SSL_DEFAULT:Mopenssl*} && ${OPENSSL_SHLIBVER} >= 15) && empty(PORT_OPTIONS:MZTS)
>   CONFIGURE_ARGS+=	--with-openssl-argon2
>   .  else
>   LIB_DEPENDS+=		libargon2.so:security/libargon2
> 

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