Mon Jul 16 10:58:50 2018 UTC ()
php*: disable global regs on i386.
Fixes PR pkg/53222 that resurfaced

Remove the previous workaround to add GCC_REQD, which isn't sufficient
any more, possibly due to enabling ssp/fortify?

XXX bumping PKGREVISION might not be sufficient, for the same reason the
GCC_REQD had to be moved to Makefile.php, it affects modules too.


(maya)
diff -r1.10 -r1.11 pkgsrc/lang/php70/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/php70/Makefile.php
diff -r1.13 -r1.14 pkgsrc/lang/php71/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/php71/Makefile.php
diff -r1.8 -r1.9 pkgsrc/lang/php72/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/php72/Makefile.php
cvs diff -r1.10 -r1.11 pkgsrc/lang/php70/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/php70/Attic/Makefile 2017/10/27 08:46:49 1.10
+++ pkgsrc/lang/php70/Attic/Makefile 2018/07/16 10:58:50 1.11
@@ -1,71 +1,78 @@ @@ -1,71 +1,78 @@
1# $NetBSD: Makefile,v 1.10 2017/10/27 08:46:49 taca Exp $ 1# $NetBSD: Makefile,v 1.11 2018/07/16 10:58:50 maya Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_VERSION} 6PKGNAME= php-${PHP_VERSION}
7CATEGORIES= lang 7CATEGORIES= lang
 8PKGREVISION= 1
8 9
9HOMEPAGE= http://www.php.net/ 10HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.0 11COMMENT= PHP Hypertext Preprocessor version 7.0
11LICENSE= php 12LICENSE= php
12 13
13TEST_TARGET= test 14TEST_TARGET= test
14 15
15USE_TOOLS+= gmake lex pkg-config 16USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 17LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= No 18PHP_CHECK_INSTALLED= No
18 19
19PHP_VERSIONS_ACCEPTED= 70 20PHP_VERSIONS_ACCEPTED= 70
20 21
21.include "Makefile.php" 22.include "Makefile.php"
22 23
23CGIDIR= ${PREFIX}/libexec/cgi-bin 24CGIDIR= ${PREFIX}/libexec/cgi-bin
24EGDIR= ${PREFIX}/share/examples/php 25EGDIR= ${PREFIX}/share/examples/php
25MESSAGE_SUBST+= CGIDIR=${CGIDIR} 26MESSAGE_SUBST+= CGIDIR=${CGIDIR}
26 27
27CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 28CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
28MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 29MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
29 30
30CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 31CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 32PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
32 33
33SUBST_CLASSES+= path 34SUBST_CLASSES+= path
34SUBST_MESSAGE.path= Fixing common paths. 35SUBST_MESSAGE.path= Fixing common paths.
35SUBST_STAGE.path= pre-configure 36SUBST_STAGE.path= pre-configure
36SUBST_FILES.path= ext/phar/phar/phar.php 37SUBST_FILES.path= ext/phar/phar/phar.php
37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php 38SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
38SUBST_FILES.path+= sapi/cgi/Makefile.frag 39SUBST_FILES.path+= sapi/cgi/Makefile.frag
39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' 40SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' 41SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
41 42
42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php 43INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
43 44
44# segfault generating phar.phar for i386 & SPARC 45# segfault generating phar.phar for i386 & SPARC
45# revisit this if builtin PCRE is updated beyond PCRE1 8.38 46# revisit this if builtin PCRE is updated beyond PCRE1 8.38
46# https://bugs.php.net/bug.php?id=73880 47# https://bugs.php.net/bug.php?id=73880
47.if ${MACHINE_ARCH} != "x86_64" 48.if ${MACHINE_ARCH} != "x86_64"
48CONFIGURE_ARGS+= --without-pcre-jit 49CONFIGURE_ARGS+= --without-pcre-jit
49.endif 50.endif
50 51
 52.if ${MACHINE_ARCH} == "i386"
 53# segfaults when buidling with many compilers
 54# https://bugs.php.net/bug.php?id=74527
 55CONFIGURE_ARGS+= --disable-gcc-global-regs
 56.endif
 57
51# Make sure modules can link correctly 58# Make sure modules can link correctly
52.if ${OPSYS} == "Darwin" 59.if ${OPSYS} == "Darwin"
53INSTALL_UNSTRIPPED= yes 60INSTALL_UNSTRIPPED= yes
54.endif 61.endif
55 62
56# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 63# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
57# and lacks the zone memory allocator 64# and lacks the zone memory allocator
58.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 65.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
59CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 66CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
60.endif 67.endif
61 68
62post-install: 69post-install:
63 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php 70 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
64 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ 71 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 72 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
66 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php 73 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
67 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ 74 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
68 ${DESTDIR}${EGDIR} 75 ${DESTDIR}${EGDIR}
69 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php 76 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
70 77
71.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/php70/Attic/Makefile.php (switch to unified diff)

--- pkgsrc/lang/php70/Attic/Makefile.php 2017/08/04 23:07:28 1.7
+++ pkgsrc/lang/php70/Attic/Makefile.php 2018/07/16 10:58:50 1.8
@@ -1,96 +1,91 @@ @@ -1,96 +1,91 @@
1# $NetBSD: Makefile.php,v 1.7 2017/08/04 23:07:28 taca Exp $ 1# $NetBSD: Makefile.php,v 1.8 2018/07/16 10:58:50 maya Exp $
2# used by lang/php70/Makefile 2# used by lang/php70/Makefile
3# used by www/ap-php/Makefile 3# used by www/ap-php/Makefile
4# used by www/php-fpm/Makefile 4# used by www/php-fpm/Makefile
5 5
6# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386 
7.if ${MACHINE_ARCH} == "i386" 
8GCC_REQD+= 4.9 
9.endif 
10 
11.include "../../lang/php70/Makefile.common" 6.include "../../lang/php70/Makefile.common"
12 7
13DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo 8DISTINFO_FILE= ${.CURDIR}/../../lang/php70/distinfo
14PATCHDIR= ${.CURDIR}/../../lang/php70/patches 9PATCHDIR= ${.CURDIR}/../../lang/php70/patches
15 10
16USE_LIBTOOL= YES 11USE_LIBTOOL= YES
17USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
18GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
19BUILD_DEFS+= VARBASE 14BUILD_DEFS+= VARBASE
20PLIST_VARS+= dtrace 15PLIST_VARS+= dtrace
21 16
22CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" 17CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
23 18
24.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
25 20
26CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
27CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d 22CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
29CONFIGURE_ARGS+= --localstatedir=${VARBASE} 24CONFIGURE_ARGS+= --localstatedir=${VARBASE}
30 25
31CONFIGURE_ARGS+= --without-mysqli 26CONFIGURE_ARGS+= --without-mysqli
32CONFIGURE_ARGS+= --without-iconv 27CONFIGURE_ARGS+= --without-iconv
33CONFIGURE_ARGS+= --without-pear 28CONFIGURE_ARGS+= --without-pear
34#CONFIGURE_ARGS+= --without-intl 29#CONFIGURE_ARGS+= --without-intl
35 30
36CONFIGURE_ARGS+= --disable-posix 31CONFIGURE_ARGS+= --disable-posix
37CONFIGURE_ARGS+= --disable-opcache 32CONFIGURE_ARGS+= --disable-opcache
38CONFIGURE_ARGS+= --disable-pdo 33CONFIGURE_ARGS+= --disable-pdo
39CONFIGURE_ARGS+= --disable-json 34CONFIGURE_ARGS+= --disable-json
40 35
41CONFIGURE_ARGS+= --enable-cgi 36CONFIGURE_ARGS+= --enable-cgi
42CONFIGURE_ARGS+= --enable-mysqlnd 37CONFIGURE_ARGS+= --enable-mysqlnd
43CONFIGURE_ARGS+= --enable-xml 38CONFIGURE_ARGS+= --enable-xml
44CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 39CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
45.include "../../textproc/libxml2/buildlink3.mk" 40.include "../../textproc/libxml2/buildlink3.mk"
46 41
47PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 42PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
48PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline 43PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline
49PKG_SUGGESTED_OPTIONS+= inet6 ssl readline 44PKG_SUGGESTED_OPTIONS+= inet6 ssl readline
50 45
51.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 46.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
52PKG_SUPPORTED_OPTIONS+= dtrace 47PKG_SUPPORTED_OPTIONS+= dtrace
53.endif 48.endif
54 49
55.include "../../mk/bsd.options.mk" 50.include "../../mk/bsd.options.mk"
56 51
57.if !empty(PKG_OPTIONS:Minet6) 52.if !empty(PKG_OPTIONS:Minet6)
58CONFIGURE_ARGS+= --enable-ipv6 53CONFIGURE_ARGS+= --enable-ipv6
59.else 54.else
60CONFIGURE_ARGS+= --disable-ipv6 55CONFIGURE_ARGS+= --disable-ipv6
61.endif 56.endif
62 57
63.if !empty(PKG_OPTIONS:Mssl) 58.if !empty(PKG_OPTIONS:Mssl)
64. include "../../security/openssl/buildlink3.mk" 59. include "../../security/openssl/buildlink3.mk"
65. if ${OPSYS} == "SunOS" 60. if ${OPSYS} == "SunOS"
66CONFIGURE_ARGS+= --with-openssl=yes 61CONFIGURE_ARGS+= --with-openssl=yes
67LIBS.SunOS+= -lcrypto 62LIBS.SunOS+= -lcrypto
68. else 63. else
69CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 64CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
70. endif 65. endif
71.else 66.else
72CONFIGURE_ARGS+= --without-openssl 67CONFIGURE_ARGS+= --without-openssl
73.endif 68.endif
74 69
75.if !empty(PKG_OPTIONS:Mmaintainer-zts) 70.if !empty(PKG_OPTIONS:Mmaintainer-zts)
76CONFIGURE_ARGS+= --enable-maintainer-zts 71CONFIGURE_ARGS+= --enable-maintainer-zts
77.endif 72.endif
78 73
79.if !empty(PKG_OPTIONS:Mreadline) 74.if !empty(PKG_OPTIONS:Mreadline)
80USE_GNU_READLINE= yes 75USE_GNU_READLINE= yes
81.include "../../devel/readline/buildlink3.mk" 76.include "../../devel/readline/buildlink3.mk"
82CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 77CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
83.else 78.else
84CONFIGURE_ARGS+= --without-readline 79CONFIGURE_ARGS+= --without-readline
85.endif 80.endif
86 81
87.if !empty(PKG_OPTIONS:Mdtrace) 82.if !empty(PKG_OPTIONS:Mdtrace)
88PLIST.dtrace= yes 83PLIST.dtrace= yes
89CONFIGURE_ARGS+= --enable-dtrace 84CONFIGURE_ARGS+= --enable-dtrace
90 85
91# See https://bugs.php.net/bug.php?id=61268 86# See https://bugs.php.net/bug.php?id=61268
92INSTALL_MAKE_FLAGS+= -r 87INSTALL_MAKE_FLAGS+= -r
93.endif 88.endif
94 89
95DL_AUTO_VARS= yes 90DL_AUTO_VARS= yes
96.include "../../mk/dlopen.buildlink3.mk" 91.include "../../mk/dlopen.buildlink3.mk"
cvs diff -r1.13 -r1.14 pkgsrc/lang/php71/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/php71/Attic/Makefile 2017/10/27 08:47:49 1.13
+++ pkgsrc/lang/php71/Attic/Makefile 2018/07/16 10:58:50 1.14
@@ -1,71 +1,78 @@ @@ -1,71 +1,78 @@
1# $NetBSD: Makefile,v 1.13 2017/10/27 08:47:49 taca Exp $ 1# $NetBSD: Makefile,v 1.14 2018/07/16 10:58:50 maya Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_VERSION:S/RC/rc/} 6PKGNAME= php-${PHP_VERSION:S/RC/rc/}
7CATEGORIES= lang 7CATEGORIES= lang
 8PKGREVISION= 1
8 9
9HOMEPAGE= http://www.php.net/ 10HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.1 11COMMENT= PHP Hypertext Preprocessor version 7.1
11LICENSE= php 12LICENSE= php
12 13
13TEST_TARGET= test 14TEST_TARGET= test
14 15
15USE_TOOLS+= gmake lex pkg-config 16USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 17LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= No 18PHP_CHECK_INSTALLED= No
18 19
19PHP_VERSIONS_ACCEPTED= 71 20PHP_VERSIONS_ACCEPTED= 71
20 21
21.include "Makefile.php" 22.include "Makefile.php"
22 23
23CGIDIR= ${PREFIX}/libexec/cgi-bin 24CGIDIR= ${PREFIX}/libexec/cgi-bin
24EGDIR= ${PREFIX}/share/examples/php 25EGDIR= ${PREFIX}/share/examples/php
25MESSAGE_SUBST+= CGIDIR=${CGIDIR} 26MESSAGE_SUBST+= CGIDIR=${CGIDIR}
26 27
27CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 28CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
28MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 29MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
29 30
30CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 31CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 32PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
32 33
33SUBST_CLASSES+= path 34SUBST_CLASSES+= path
34SUBST_MESSAGE.path= Fixing common paths. 35SUBST_MESSAGE.path= Fixing common paths.
35SUBST_STAGE.path= pre-configure 36SUBST_STAGE.path= pre-configure
36SUBST_FILES.path= ext/phar/phar/phar.php 37SUBST_FILES.path= ext/phar/phar/phar.php
37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php 38SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
38SUBST_FILES.path+= sapi/cgi/Makefile.frag 39SUBST_FILES.path+= sapi/cgi/Makefile.frag
39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' 40SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' 41SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
41 42
42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php 43INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
43 44
44# segfault generating phar.phar for i386 & SPARC 45# segfault generating phar.phar for i386 & SPARC
45# revisit this if builtin PCRE is updated beyond PCRE1 8.38 46# revisit this if builtin PCRE is updated beyond PCRE1 8.38
46# https://bugs.php.net/bug.php?id=73880 47# https://bugs.php.net/bug.php?id=73880
47.if ${MACHINE_ARCH} != "x86_64" 48.if ${MACHINE_ARCH} != "x86_64"
48CONFIGURE_ARGS+= --without-pcre-jit 49CONFIGURE_ARGS+= --without-pcre-jit
49.endif 50.endif
50 51
 52# segfaults when buidling with many compilers
 53# https://bugs.php.net/bug.php?id=74527
 54.if ${MACHINE_ARCH} == "i386"
 55CONFIGURE_ARGS+= --disable-gcc-global-regs
 56.endif
 57
51# Make sure modules can link correctly 58# Make sure modules can link correctly
52.if ${OPSYS} == "Darwin" 59.if ${OPSYS} == "Darwin"
53INSTALL_UNSTRIPPED= yes 60INSTALL_UNSTRIPPED= yes
54.endif 61.endif
55 62
56# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 63# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
57# and lacks the zone memory allocator 64# and lacks the zone memory allocator
58.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 65.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
59CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 66CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
60.endif 67.endif
61 68
62post-install: 69post-install:
63 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php 70 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
64 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ 71 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 72 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
66 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php 73 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
67 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ 74 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
68 ${DESTDIR}${EGDIR} 75 ${DESTDIR}${EGDIR}
69 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php 76 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
70 77
71.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/lang/php71/Attic/Makefile.php (switch to unified diff)

--- pkgsrc/lang/php71/Attic/Makefile.php 2017/08/04 23:08:47 1.6
+++ pkgsrc/lang/php71/Attic/Makefile.php 2018/07/16 10:58:50 1.7
@@ -1,96 +1,91 @@ @@ -1,96 +1,91 @@
1# $NetBSD: Makefile.php,v 1.6 2017/08/04 23:08:47 taca Exp $ 1# $NetBSD: Makefile.php,v 1.7 2018/07/16 10:58:50 maya Exp $
2# used by lang/php71/Makefile 2# used by lang/php71/Makefile
3# used by www/ap-php/Makefile 3# used by www/ap-php/Makefile
4# used by www/php-fpm/Makefile 4# used by www/php-fpm/Makefile
5 5
6# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386 
7.if ${MACHINE_ARCH} == "i386" 
8GCC_REQD+= 4.9 
9.endif 
10 
11.include "../../lang/php71/Makefile.common" 6.include "../../lang/php71/Makefile.common"
12 7
13DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo 8DISTINFO_FILE= ${.CURDIR}/../../lang/php71/distinfo
14PATCHDIR= ${.CURDIR}/../../lang/php71/patches 9PATCHDIR= ${.CURDIR}/../../lang/php71/patches
15 10
16USE_LIBTOOL= YES 11USE_LIBTOOL= YES
17USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
18GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
19BUILD_DEFS+= VARBASE 14BUILD_DEFS+= VARBASE
20PLIST_VARS+= dtrace 15PLIST_VARS+= dtrace
21 16
22CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" 17CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
23 18
24.include "../../mk/bsd.prefs.mk" 19.include "../../mk/bsd.prefs.mk"
25 20
26CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} 21CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
27CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d 22CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
28CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
29CONFIGURE_ARGS+= --localstatedir=${VARBASE} 24CONFIGURE_ARGS+= --localstatedir=${VARBASE}
30 25
31CONFIGURE_ARGS+= --without-mysqli 26CONFIGURE_ARGS+= --without-mysqli
32CONFIGURE_ARGS+= --without-iconv 27CONFIGURE_ARGS+= --without-iconv
33CONFIGURE_ARGS+= --without-pear 28CONFIGURE_ARGS+= --without-pear
34#CONFIGURE_ARGS+= --without-intl 29#CONFIGURE_ARGS+= --without-intl
35 30
36CONFIGURE_ARGS+= --disable-posix 31CONFIGURE_ARGS+= --disable-posix
37CONFIGURE_ARGS+= --disable-opcache 32CONFIGURE_ARGS+= --disable-opcache
38CONFIGURE_ARGS+= --disable-pdo 33CONFIGURE_ARGS+= --disable-pdo
39CONFIGURE_ARGS+= --disable-json 34CONFIGURE_ARGS+= --disable-json
40 35
41CONFIGURE_ARGS+= --enable-cgi 36CONFIGURE_ARGS+= --enable-cgi
42CONFIGURE_ARGS+= --enable-mysqlnd 37CONFIGURE_ARGS+= --enable-mysqlnd
43CONFIGURE_ARGS+= --enable-xml 38CONFIGURE_ARGS+= --enable-xml
44CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 39CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
45.include "../../textproc/libxml2/buildlink3.mk" 40.include "../../textproc/libxml2/buildlink3.mk"
46 41
47PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 42PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
48PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline 43PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline
49PKG_SUGGESTED_OPTIONS+= inet6 ssl readline 44PKG_SUGGESTED_OPTIONS+= inet6 ssl readline
50 45
51.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 46.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
52PKG_SUPPORTED_OPTIONS+= dtrace 47PKG_SUPPORTED_OPTIONS+= dtrace
53.endif 48.endif
54 49
55.include "../../mk/bsd.options.mk" 50.include "../../mk/bsd.options.mk"
56 51
57.if !empty(PKG_OPTIONS:Minet6) 52.if !empty(PKG_OPTIONS:Minet6)
58CONFIGURE_ARGS+= --enable-ipv6 53CONFIGURE_ARGS+= --enable-ipv6
59.else 54.else
60CONFIGURE_ARGS+= --disable-ipv6 55CONFIGURE_ARGS+= --disable-ipv6
61.endif 56.endif
62 57
63.if !empty(PKG_OPTIONS:Mssl) 58.if !empty(PKG_OPTIONS:Mssl)
64. include "../../security/openssl/buildlink3.mk" 59. include "../../security/openssl/buildlink3.mk"
65. if ${OPSYS} == "SunOS" 60. if ${OPSYS} == "SunOS"
66CONFIGURE_ARGS+= --with-openssl=yes 61CONFIGURE_ARGS+= --with-openssl=yes
67LIBS.SunOS+= -lcrypto 62LIBS.SunOS+= -lcrypto
68. else 63. else
69CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 64CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
70. endif 65. endif
71.else 66.else
72CONFIGURE_ARGS+= --without-openssl 67CONFIGURE_ARGS+= --without-openssl
73.endif 68.endif
74 69
75.if !empty(PKG_OPTIONS:Mmaintainer-zts) 70.if !empty(PKG_OPTIONS:Mmaintainer-zts)
76CONFIGURE_ARGS+= --enable-maintainer-zts 71CONFIGURE_ARGS+= --enable-maintainer-zts
77.endif 72.endif
78 73
79.if !empty(PKG_OPTIONS:Mreadline) 74.if !empty(PKG_OPTIONS:Mreadline)
80USE_GNU_READLINE= yes 75USE_GNU_READLINE= yes
81.include "../../devel/readline/buildlink3.mk" 76.include "../../devel/readline/buildlink3.mk"
82CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 77CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
83.else 78.else
84CONFIGURE_ARGS+= --without-readline 79CONFIGURE_ARGS+= --without-readline
85.endif 80.endif
86 81
87.if !empty(PKG_OPTIONS:Mdtrace) 82.if !empty(PKG_OPTIONS:Mdtrace)
88PLIST.dtrace= yes 83PLIST.dtrace= yes
89CONFIGURE_ARGS+= --enable-dtrace 84CONFIGURE_ARGS+= --enable-dtrace
90 85
91# See https://bugs.php.net/bug.php?id=61268 86# See https://bugs.php.net/bug.php?id=61268
92INSTALL_MAKE_FLAGS+= -r 87INSTALL_MAKE_FLAGS+= -r
93.endif 88.endif
94 89
95DL_AUTO_VARS= yes 90DL_AUTO_VARS= yes
96.include "../../mk/dlopen.buildlink3.mk" 91.include "../../mk/dlopen.buildlink3.mk"
cvs diff -r1.8 -r1.9 pkgsrc/lang/php72/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/php72/Attic/Makefile 2018/04/26 15:44:15 1.8
+++ pkgsrc/lang/php72/Attic/Makefile 2018/07/16 10:58:50 1.9
@@ -1,64 +1,71 @@ @@ -1,64 +1,71 @@
1# $NetBSD: Makefile,v 1.8 2018/04/26 15:44:15 taca Exp $ 1# $NetBSD: Makefile,v 1.9 2018/07/16 10:58:50 maya Exp $
2 2
3# 3#
4# We can't omit PKGNAME here to handle PKG_OPTIONS. 4# We can't omit PKGNAME here to handle PKG_OPTIONS.
5# 5#
6PKGNAME= php-${PHP_VERSION:S/RC/rc/} 6PKGNAME= php-${PHP_VERSION:S/RC/rc/}
7CATEGORIES= lang 7CATEGORIES= lang
 8PKGREVISION= 1
8 9
9HOMEPAGE= http://www.php.net/ 10HOMEPAGE= http://www.php.net/
10COMMENT= PHP Hypertext Preprocessor version 7.2 11COMMENT= PHP Hypertext Preprocessor version 7.2
11LICENSE= php 12LICENSE= php
12 13
13TEST_TARGET= test 14TEST_TARGET= test
14 15
15USE_TOOLS+= gmake lex pkg-config 16USE_TOOLS+= gmake lex pkg-config
16LIBTOOL_OVERRIDE= # empty 17LIBTOOL_OVERRIDE= # empty
17PHP_CHECK_INSTALLED= No 18PHP_CHECK_INSTALLED= No
18 19
19PHP_VERSIONS_ACCEPTED= 72 20PHP_VERSIONS_ACCEPTED= 72
20 21
21.include "Makefile.php" 22.include "Makefile.php"
22 23
23CGIDIR= ${PREFIX}/libexec/cgi-bin 24CGIDIR= ${PREFIX}/libexec/cgi-bin
24EGDIR= ${PREFIX}/share/examples/php 25EGDIR= ${PREFIX}/share/examples/php
25MESSAGE_SUBST+= CGIDIR=${CGIDIR} 26MESSAGE_SUBST+= CGIDIR=${CGIDIR}
26 27
27CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q} 28CONFIGURE_ENV+= lt_cv_path_SED=${SED:Q}
28MAKE_ENV+= INSTALL_ROOT=${DESTDIR} 29MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
29 30
30CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini 31CONF_FILES= ${EGDIR}/php.ini-production ${PKG_SYSCONFDIR}/php.ini
31PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}" 32PLIST_SUBST+= PHPEXTDIR="${PHP_EXTENSION_DIR}"
32 33
33SUBST_CLASSES+= path 34SUBST_CLASSES+= path
34SUBST_MESSAGE.path= Fixing common paths. 35SUBST_MESSAGE.path= Fixing common paths.
35SUBST_STAGE.path= pre-configure 36SUBST_STAGE.path= pre-configure
36SUBST_FILES.path= ext/phar/phar/phar.php 37SUBST_FILES.path= ext/phar/phar/phar.php
37SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php 38SUBST_FILES.path+= php.ini-development php.ini-production run-tests.php
38SUBST_FILES.path+= sapi/cgi/Makefile.frag 39SUBST_FILES.path+= sapi/cgi/Makefile.frag
39SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g' 40SUBST_SED.path= -e 's,@CGIDIR@,${CGIDIR},g'
40SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g' 41SUBST_SED.path+= -e 's,@PREFIX@,${PREFIX},g'
41 42
42INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php 43INSTALLATION_DIRS+= ${CGIDIR} ${PHP_EXTENSION_DIR} ${EGDIR} share/php
43 44
 45# segfaults when buidling with many compilers
 46# https://bugs.php.net/bug.php?id=74527
 47.if ${MACHINE_ARCH} == "i386"
 48CONFIGURE_ARGS+= --disable-gcc-global-regs
 49.endif
 50
44# Make sure modules can link correctly 51# Make sure modules can link correctly
45.if ${OPSYS} == "Darwin" 52.if ${OPSYS} == "Darwin"
46INSTALL_UNSTRIPPED= yes 53INSTALL_UNSTRIPPED= yes
47.endif 54.endif
48 55
49# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2) 56# Darwin < 9 (Mac OS X < 10.5 "Leopard") doesn't have gethostuuid(2)
50# and lacks the zone memory allocator 57# and lacks the zone memory allocator
51.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*) 58.if !empty(MACHINE_PLATFORM:MDarwin-[0-8].*-*)
52CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC 59CFLAGS+= -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_WITHOUT_ZONEMALLOC
53.endif 60.endif
54 61
55post-install: 62post-install:
56 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php 63 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php ${DESTDIR}${PREFIX}/bin/php
57 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \ 64 ${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
58 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1 65 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/php.1
59 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php 66 ${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php-cgi ${DESTDIR}${CGIDIR}/php
60 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \ 67 cd ${WRKSRC}; ${INSTALL_DATA} php.ini-development php.ini-production \
61 ${DESTDIR}${EGDIR} 68 ${DESTDIR}${EGDIR}
62 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php 69 ${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR}${PREFIX}/share/php
63 70
64.include "../../mk/bsd.pkg.mk" 71.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/lang/php72/Attic/Makefile.php (switch to unified diff)

--- pkgsrc/lang/php72/Attic/Makefile.php 2018/02/05 08:51:25 1.4
+++ pkgsrc/lang/php72/Attic/Makefile.php 2018/07/16 10:58:50 1.5
@@ -1,113 +1,108 @@ @@ -1,113 +1,108 @@
1# $NetBSD: Makefile.php,v 1.4 2018/02/05 08:51:25 jdolecek Exp $ 1# $NetBSD: Makefile.php,v 1.5 2018/07/16 10:58:50 maya Exp $
2# used by lang/php72/Makefile 2# used by lang/php72/Makefile
3# used by www/ap-php/Makefile 3# used by www/ap-php/Makefile
4# used by www/php-fpm/Makefile 4# used by www/php-fpm/Makefile
5 5
6# PHP bug #74526 - segfaults on build with GCC 4.8.5 i386 
7.if ${MACHINE_ARCH} == "i386" 
8GCC_REQD+= 4.9 
9.endif 
10 
11# the binary actually needs full dep on PCRE 6# the binary actually needs full dep on PCRE
12BUILDLINK_DEPMETHOD.pcre= full 7BUILDLINK_DEPMETHOD.pcre= full
13 8
14.include "../../lang/php72/Makefile.common" 9.include "../../lang/php72/Makefile.common"
15 10
16DISTINFO_FILE= ${.CURDIR}/../../lang/php72/distinfo 11DISTINFO_FILE= ${.CURDIR}/../../lang/php72/distinfo
17PATCHDIR= ${.CURDIR}/../../lang/php72/patches 12PATCHDIR= ${.CURDIR}/../../lang/php72/patches
18 13
19USE_LIBTOOL= YES 14USE_LIBTOOL= YES
20USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
21GNU_CONFIGURE= YES 16GNU_CONFIGURE= YES
22BUILD_DEFS+= VARBASE 17BUILD_DEFS+= VARBASE
23PLIST_VARS+= dtrace 18PLIST_VARS+= dtrace
24 19
25CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" 20CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
26 21
27.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
28 23
29CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} 24CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR}
30CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d 25CONFIGURE_ARGS+= --with-config-file-scan-dir=${PKG_SYSCONFDIR}/php.d
31CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 26CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
32CONFIGURE_ARGS+= --localstatedir=${VARBASE} 27CONFIGURE_ARGS+= --localstatedir=${VARBASE}
33 28
34CONFIGURE_ARGS+= --without-mysqli 29CONFIGURE_ARGS+= --without-mysqli
35CONFIGURE_ARGS+= --without-iconv 30CONFIGURE_ARGS+= --without-iconv
36CONFIGURE_ARGS+= --without-pear 31CONFIGURE_ARGS+= --without-pear
37#CONFIGURE_ARGS+= --without-intl 32#CONFIGURE_ARGS+= --without-intl
38 33
39CONFIGURE_ARGS+= --disable-posix 34CONFIGURE_ARGS+= --disable-posix
40CONFIGURE_ARGS+= --disable-opcache 35CONFIGURE_ARGS+= --disable-opcache
41CONFIGURE_ARGS+= --disable-pdo 36CONFIGURE_ARGS+= --disable-pdo
42CONFIGURE_ARGS+= --disable-json 37CONFIGURE_ARGS+= --disable-json
43 38
44CONFIGURE_ARGS+= --enable-cgi 39CONFIGURE_ARGS+= --enable-cgi
45CONFIGURE_ARGS+= --enable-mysqlnd 40CONFIGURE_ARGS+= --enable-mysqlnd
46CONFIGURE_ARGS+= --enable-xml 41CONFIGURE_ARGS+= --enable-xml
47CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 42CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
48.include "../../textproc/libxml2/buildlink3.mk" 43.include "../../textproc/libxml2/buildlink3.mk"
49 44
50CONFIGURE_ARGS+= --with-pcre-regex=${BUILDLINK_PREFIX.pcre} 45CONFIGURE_ARGS+= --with-pcre-regex=${BUILDLINK_PREFIX.pcre}
51 46
52PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 47PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
53PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 sqlite3 48PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 sqlite3
54PKG_SUGGESTED_OPTIONS+= inet6 ssl readline sqlite3 49PKG_SUGGESTED_OPTIONS+= inet6 ssl readline sqlite3
55 50
56.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 51.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
57PKG_SUPPORTED_OPTIONS+= dtrace 52PKG_SUPPORTED_OPTIONS+= dtrace
58.endif 53.endif
59 54
60.include "../../mk/bsd.options.mk" 55.include "../../mk/bsd.options.mk"
61 56
62.if !empty(PKG_OPTIONS:Minet6) 57.if !empty(PKG_OPTIONS:Minet6)
63CONFIGURE_ARGS+= --enable-ipv6 58CONFIGURE_ARGS+= --enable-ipv6
64.else 59.else
65CONFIGURE_ARGS+= --disable-ipv6 60CONFIGURE_ARGS+= --disable-ipv6
66.endif 61.endif
67 62
68.if !empty(PKG_OPTIONS:Mssl) 63.if !empty(PKG_OPTIONS:Mssl)
69. include "../../security/openssl/buildlink3.mk" 64. include "../../security/openssl/buildlink3.mk"
70. if ${OPSYS} == "SunOS" 65. if ${OPSYS} == "SunOS"
71CONFIGURE_ARGS+= --with-openssl=yes 66CONFIGURE_ARGS+= --with-openssl=yes
72LIBS.SunOS+= -lcrypto 67LIBS.SunOS+= -lcrypto
73. else 68. else
74CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 69CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
75. endif 70. endif
76.else 71.else
77CONFIGURE_ARGS+= --without-openssl 72CONFIGURE_ARGS+= --without-openssl
78.endif 73.endif
79 74
80.if !empty(PKG_OPTIONS:Mmaintainer-zts) 75.if !empty(PKG_OPTIONS:Mmaintainer-zts)
81CONFIGURE_ARGS+= --enable-maintainer-zts 76CONFIGURE_ARGS+= --enable-maintainer-zts
82.endif 77.endif
83 78
84.if !empty(PKG_OPTIONS:Mreadline) 79.if !empty(PKG_OPTIONS:Mreadline)
85USE_GNU_READLINE= yes 80USE_GNU_READLINE= yes
86.include "../../devel/readline/buildlink3.mk" 81.include "../../devel/readline/buildlink3.mk"
87CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 82CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
88.else 83.else
89CONFIGURE_ARGS+= --without-readline 84CONFIGURE_ARGS+= --without-readline
90.endif 85.endif
91 86
92.if !empty(PKG_OPTIONS:Mdtrace) 87.if !empty(PKG_OPTIONS:Mdtrace)
93PLIST.dtrace= yes 88PLIST.dtrace= yes
94CONFIGURE_ARGS+= --enable-dtrace 89CONFIGURE_ARGS+= --enable-dtrace
95 90
96# See https://bugs.php.net/bug.php?id=61268 91# See https://bugs.php.net/bug.php?id=61268
97INSTALL_MAKE_FLAGS+= -r 92INSTALL_MAKE_FLAGS+= -r
98.endif 93.endif
99 94
100.if !empty(PKG_OPTIONS:Margon2) 95.if !empty(PKG_OPTIONS:Margon2)
101CONFIGURE_ARGS+= --with-password-argon2=${BUILDLINK_PREFIX.argon2} 96CONFIGURE_ARGS+= --with-password-argon2=${BUILDLINK_PREFIX.argon2}
102.include "../../security/argon2/buildlink3.mk" 97.include "../../security/argon2/buildlink3.mk"
103.endif 98.endif
104 99
105.if !empty(PKG_OPTIONS:Msqlite3) 100.if !empty(PKG_OPTIONS:Msqlite3)
106CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} 101CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3}
107.include "../../databases/sqlite3/buildlink3.mk" 102.include "../../databases/sqlite3/buildlink3.mk"
108.else 103.else
109CONFIGURE_ARGS+= --without-sqlite3 104CONFIGURE_ARGS+= --without-sqlite3
110.endif 105.endif
111 106
112DL_AUTO_VARS= yes 107DL_AUTO_VARS= yes
113.include "../../mk/dlopen.buildlink3.mk" 108.include "../../mk/dlopen.buildlink3.mk"