Fri Feb 4 01:41:01 2022 UTC ()
php80 & php81: correct zts option invocation

Starting with PHP 8.0, zts is enabled with --enable-zts, rather than
the older --enable-maintainer-zts. Addresses PR pkg/56681.

The actual pkgsrc option name should probably be adjusted, and the
current "maintainer-zts" moved to PKG_LEGACY_OPTIONS. I've left it for
another commit.


(gutteridge)
diff -r1.3 -r1.4 pkgsrc/lang/php80/options.mk
diff -r1.1 -r1.2 pkgsrc/lang/php81/options.mk
cvs diff -r1.3 -r1.4 pkgsrc/lang/php80/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/php80/options.mk 2021/12/19 05:03:19 1.3
+++ pkgsrc/lang/php80/options.mk 2022/02/04 01:41:01 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.3 2021/12/19 05:03:19 taca Exp $ 1# $NetBSD: options.mk,v 1.4 2022/02/04 01:41:01 gutteridge Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 3PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
4PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed 4PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed
5PKG_SUPPORTED_OPTIONS+= disable-filter-url 5PKG_SUPPORTED_OPTIONS+= disable-filter-url
6PKG_SUGGESTED_OPTIONS+= inet6 ssl readline 6PKG_SUGGESTED_OPTIONS+= inet6 ssl readline
7 7
8.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 8.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
9PKG_SUPPORTED_OPTIONS+= dtrace 9PKG_SUPPORTED_OPTIONS+= dtrace
10.endif 10.endif
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14.if !empty(PKG_OPTIONS:Minet6) 14.if !empty(PKG_OPTIONS:Minet6)
@@ -20,27 +20,27 @@ CONFIGURE_ARGS+= --disable-ipv6 @@ -20,27 +20,27 @@ CONFIGURE_ARGS+= --disable-ipv6
20.if !empty(PKG_OPTIONS:Mssl) 20.if !empty(PKG_OPTIONS:Mssl)
21. include "../../security/openssl/buildlink3.mk" 21. include "../../security/openssl/buildlink3.mk"
22. if ${OPSYS} == "SunOS" 22. if ${OPSYS} == "SunOS"
23CONFIGURE_ARGS+= --with-openssl=yes 23CONFIGURE_ARGS+= --with-openssl=yes
24LIBS.SunOS+= -lcrypto 24LIBS.SunOS+= -lcrypto
25. else 25. else
26CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 26CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
27. endif 27. endif
28.else 28.else
29CONFIGURE_ARGS+= --without-openssl 29CONFIGURE_ARGS+= --without-openssl
30.endif 30.endif
31 31
32.if !empty(PKG_OPTIONS:Mmaintainer-zts) 32.if !empty(PKG_OPTIONS:Mmaintainer-zts)
33CONFIGURE_ARGS+= --enable-maintainer-zts 33CONFIGURE_ARGS+= --enable-zts
34.endif 34.endif
35 35
36.if !empty(PKG_OPTIONS:Mreadline) 36.if !empty(PKG_OPTIONS:Mreadline)
37.include "../../devel/readline/buildlink3.mk" 37.include "../../devel/readline/buildlink3.mk"
38CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 38CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
39.else 39.else
40CONFIGURE_ARGS+= --without-readline 40CONFIGURE_ARGS+= --without-readline
41.endif 41.endif
42 42
43.if !empty(PKG_OPTIONS:Mdtrace) 43.if !empty(PKG_OPTIONS:Mdtrace)
44PLIST.dtrace= yes 44PLIST.dtrace= yes
45CONFIGURE_ARGS+= --enable-dtrace 45CONFIGURE_ARGS+= --enable-dtrace
46 46
cvs diff -r1.1 -r1.2 pkgsrc/lang/php81/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/php81/options.mk 2021/11/27 07:24:43 1.1
+++ pkgsrc/lang/php81/options.mk 2022/02/04 01:41:01 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.1 2021/11/27 07:24:43 taca Exp $ 1# $NetBSD: options.mk,v 1.2 2022/02/04 01:41:01 gutteridge Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 3PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
4PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed 4PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed
5PKG_SUPPORTED_OPTIONS+= disable-filter-url 5PKG_SUPPORTED_OPTIONS+= disable-filter-url
6PKG_SUGGESTED_OPTIONS+= inet6 ssl readline 6PKG_SUGGESTED_OPTIONS+= inet6 ssl readline
7 7
8.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 8.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
9PKG_SUPPORTED_OPTIONS+= dtrace 9PKG_SUPPORTED_OPTIONS+= dtrace
10.endif 10.endif
11 11
12.include "../../mk/bsd.options.mk" 12.include "../../mk/bsd.options.mk"
13 13
14.if !empty(PKG_OPTIONS:Minet6) 14.if !empty(PKG_OPTIONS:Minet6)
@@ -20,27 +20,27 @@ CONFIGURE_ARGS+= --disable-ipv6 @@ -20,27 +20,27 @@ CONFIGURE_ARGS+= --disable-ipv6
20.if !empty(PKG_OPTIONS:Mssl) 20.if !empty(PKG_OPTIONS:Mssl)
21. include "../../security/openssl/buildlink3.mk" 21. include "../../security/openssl/buildlink3.mk"
22. if ${OPSYS} == "SunOS" 22. if ${OPSYS} == "SunOS"
23CONFIGURE_ARGS+= --with-openssl=yes 23CONFIGURE_ARGS+= --with-openssl=yes
24LIBS.SunOS+= -lcrypto 24LIBS.SunOS+= -lcrypto
25. else 25. else
26CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 26CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
27. endif 27. endif
28.else 28.else
29CONFIGURE_ARGS+= --without-openssl 29CONFIGURE_ARGS+= --without-openssl
30.endif 30.endif
31 31
32.if !empty(PKG_OPTIONS:Mmaintainer-zts) 32.if !empty(PKG_OPTIONS:Mmaintainer-zts)
33CONFIGURE_ARGS+= --enable-maintainer-zts 33CONFIGURE_ARGS+= --enable-zts
34.endif 34.endif
35 35
36.if !empty(PKG_OPTIONS:Mreadline) 36.if !empty(PKG_OPTIONS:Mreadline)
37.include "../../devel/readline/buildlink3.mk" 37.include "../../devel/readline/buildlink3.mk"
38CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 38CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
39.else 39.else
40CONFIGURE_ARGS+= --without-readline 40CONFIGURE_ARGS+= --without-readline
41.endif 41.endif
42 42
43.if !empty(PKG_OPTIONS:Mdtrace) 43.if !empty(PKG_OPTIONS:Mdtrace)
44PLIST.dtrace= yes 44PLIST.dtrace= yes
45CONFIGURE_ARGS+= --enable-dtrace 45CONFIGURE_ARGS+= --enable-dtrace
46 46