Fri Nov 20 15:34:11 2020 UTC ()
php73: add default-off php-embed option to install embed SAPI

Requested by Sergey Osokin in PR 55508.


(otis)
diff -r1.14 -r1.15 pkgsrc/lang/php73/Makefile
diff -r1.4 -r1.5 pkgsrc/lang/php73/Makefile.php
diff -r1.1 -r1.2 pkgsrc/lang/php73/PLIST
cvs diff -r1.14 -r1.15 pkgsrc/lang/php73/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/php73/Attic/Makefile 2020/11/05 09:06:58 1.14
+++ pkgsrc/lang/php73/Attic/Makefile 2020/11/20 15:34:11 1.15
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.14 2020/11/05 09:06:58 ryoon Exp $ 1# $NetBSD: Makefile,v 1.15 2020/11/20 15:34:11 otis 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/}
7PKGREVISION= 1 7PKGREVISION= 2
8 8
9COMMENT= PHP Hypertext Preprocessor version 7.3 9COMMENT= PHP Hypertext Preprocessor version 7.3
10LICENSE= php 10LICENSE= php
11 11
12TEST_TARGET= test 12TEST_TARGET= test
13 13
14USE_TOOLS+= gmake lex pkg-config 14USE_TOOLS+= gmake lex pkg-config
15LIBTOOL_OVERRIDE= # empty 15LIBTOOL_OVERRIDE= # empty
16PHP_CHECK_INSTALLED= No 16PHP_CHECK_INSTALLED= No
17 17
18PHP_VERSIONS_ACCEPTED= 73 18PHP_VERSIONS_ACCEPTED= 73
19 19
20.include "Makefile.php" 20.include "Makefile.php"
cvs diff -r1.4 -r1.5 pkgsrc/lang/php73/Attic/Makefile.php (expand / switch to unified diff)

--- pkgsrc/lang/php73/Attic/Makefile.php 2020/02/09 22:01:10 1.4
+++ pkgsrc/lang/php73/Attic/Makefile.php 2020/11/20 15:34:11 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.php,v 1.4 2020/02/09 22:01:10 rillig Exp $ 1# $NetBSD: Makefile.php,v 1.5 2020/11/20 15:34:11 otis Exp $
2# used by lang/php73/Makefile 2# used by lang/php73/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# segfaults when buidling with many compilers 6# segfaults when buidling with many compilers
7# https://bugs.php.net/bug.php?id=74527 7# https://bugs.php.net/bug.php?id=74527
8# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236 8# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86236
9.if ${MACHINE_ARCH} == "i386" 9.if ${MACHINE_ARCH} == "i386"
10CONFIGURE_ARGS+= --disable-gcc-global-regs 10CONFIGURE_ARGS+= --disable-gcc-global-regs
11.endif 11.endif
12 12
13# the binary actually needs full dep on PCRE 13# the binary actually needs full dep on PCRE
14BUILDLINK_DEPMETHOD.pcre2= full 14BUILDLINK_DEPMETHOD.pcre2= full
@@ -44,27 +44,27 @@ CONFIGURE_ARGS+= --disable-opcache @@ -44,27 +44,27 @@ CONFIGURE_ARGS+= --disable-opcache
44CONFIGURE_ARGS+= --disable-pdo 44CONFIGURE_ARGS+= --disable-pdo
45CONFIGURE_ARGS+= --disable-json 45CONFIGURE_ARGS+= --disable-json
46 46
47CONFIGURE_ARGS+= --enable-cgi 47CONFIGURE_ARGS+= --enable-cgi
48CONFIGURE_ARGS+= --enable-mysqlnd 48CONFIGURE_ARGS+= --enable-mysqlnd
49CONFIGURE_ARGS+= --enable-xml 49CONFIGURE_ARGS+= --enable-xml
50CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} 50CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
51.include "../../textproc/libxml2/buildlink3.mk" 51.include "../../textproc/libxml2/buildlink3.mk"
52 52
53CONFIGURE_ARGS+= --with-pcre-regex=${BUILDLINK_PREFIX.pcre2} 53CONFIGURE_ARGS+= --with-pcre-regex=${BUILDLINK_PREFIX.pcre2}
54GNU_CONFIGURE_STRICT= no 54GNU_CONFIGURE_STRICT= no
55 55
56PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX} 56PKG_OPTIONS_VAR= PKG_OPTIONS.${PHP_PKG_PREFIX}
57PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 57PKG_SUPPORTED_OPTIONS+= inet6 ssl maintainer-zts readline argon2 php-embed
58PKG_SUPPORTED_OPTIONS+= disable-filter-url 58PKG_SUPPORTED_OPTIONS+= disable-filter-url
59PKG_SUGGESTED_OPTIONS+= inet6 ssl readline 59PKG_SUGGESTED_OPTIONS+= inet6 ssl readline
60 60
61.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" 61.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
62PKG_SUPPORTED_OPTIONS+= dtrace 62PKG_SUPPORTED_OPTIONS+= dtrace
63.endif 63.endif
64 64
65.include "../../mk/bsd.options.mk" 65.include "../../mk/bsd.options.mk"
66 66
67.if !empty(PKG_OPTIONS:Minet6) 67.if !empty(PKG_OPTIONS:Minet6)
68CONFIGURE_ARGS+= --enable-ipv6 68CONFIGURE_ARGS+= --enable-ipv6
69.else 69.else
70CONFIGURE_ARGS+= --disable-ipv6 70CONFIGURE_ARGS+= --disable-ipv6
@@ -100,15 +100,29 @@ CONFIGURE_ARGS+= --enable-dtrace @@ -100,15 +100,29 @@ CONFIGURE_ARGS+= --enable-dtrace
100# See https://bugs.php.net/bug.php?id=61268 100# See https://bugs.php.net/bug.php?id=61268
101INSTALL_MAKE_FLAGS+= -r 101INSTALL_MAKE_FLAGS+= -r
102.endif 102.endif
103 103
104.if !empty(PKG_OPTIONS:Margon2) 104.if !empty(PKG_OPTIONS:Margon2)
105CONFIGURE_ARGS+= --with-password-argon2=${BUILDLINK_PREFIX.argon2} 105CONFIGURE_ARGS+= --with-password-argon2=${BUILDLINK_PREFIX.argon2}
106.include "../../security/argon2/buildlink3.mk" 106.include "../../security/argon2/buildlink3.mk"
107.endif 107.endif
108 108
109.if !empty(PKG_OPTIONS:Mdisable-filter-url) 109.if !empty(PKG_OPTIONS:Mdisable-filter-url)
110CFLAGS+= -DDISABLE_FILTER_URL 110CFLAGS+= -DDISABLE_FILTER_URL
111.endif 111.endif
112 112
 113PLIST_VARS+= embed
 114
 115.if !empty(PKG_OPTIONS:Mphp-embed)
 116CONFIGURE_ARGS+= --enable-embed
 117INSTALLATION_DIRS+= include/php/sapi/embed
 118PLIST.embed= yes
 119
 120.PHONY: post-install-embed
 121post-install: post-install-embed
 122post-install-embed:
 123 ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/
 124 ${INSTALL_LIB} ${WRKSRC}/libs/libphp7.so ${DESTDIR}${PREFIX}/lib/
 125.endif
 126
113DL_AUTO_VARS= yes 127DL_AUTO_VARS= yes
114.include "../../mk/dlopen.buildlink3.mk" 128.include "../../mk/dlopen.buildlink3.mk"
cvs diff -r1.1 -r1.2 pkgsrc/lang/php73/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/lang/php73/Attic/PLIST 2018/12/15 17:12:44 1.1
+++ pkgsrc/lang/php73/Attic/PLIST 2020/11/20 15:34:11 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2018/12/15 17:12:44 taca Exp $ 1@comment $NetBSD: PLIST,v 1.2 2020/11/20 15:34:11 otis Exp $
2bin/phar 2bin/phar
3bin/phar.phar 3bin/phar.phar
4bin/php 4bin/php
5bin/php-config 5bin/php-config
6bin/phpdbg 6bin/phpdbg
7bin/phpize 7bin/phpize
8include/php/TSRM/TSRM.h 8include/php/TSRM/TSRM.h
9include/php/TSRM/readdir.h 9include/php/TSRM/readdir.h
10include/php/TSRM/tsrm_config.h 10include/php/TSRM/tsrm_config.h
11include/php/TSRM/tsrm_config.w32.h 11include/php/TSRM/tsrm_config.w32.h
12include/php/TSRM/tsrm_config_common.h 12include/php/TSRM/tsrm_config_common.h
13include/php/TSRM/tsrm_strtok_r.h 13include/php/TSRM/tsrm_strtok_r.h
14include/php/TSRM/tsrm_win32.h 14include/php/TSRM/tsrm_win32.h
@@ -249,26 +249,28 @@ include/php/main/php_variables.h @@ -249,26 +249,28 @@ include/php/main/php_variables.h
249include/php/main/php_version.h 249include/php/main/php_version.h
250include/php/main/rfc1867.h 250include/php/main/rfc1867.h
251include/php/main/snprintf.h 251include/php/main/snprintf.h
252include/php/main/spprintf.h 252include/php/main/spprintf.h
253include/php/main/streams/php_stream_context.h 253include/php/main/streams/php_stream_context.h
254include/php/main/streams/php_stream_filter_api.h 254include/php/main/streams/php_stream_filter_api.h
255include/php/main/streams/php_stream_glob_wrapper.h 255include/php/main/streams/php_stream_glob_wrapper.h
256include/php/main/streams/php_stream_mmap.h 256include/php/main/streams/php_stream_mmap.h
257include/php/main/streams/php_stream_plain_wrapper.h 257include/php/main/streams/php_stream_plain_wrapper.h
258include/php/main/streams/php_stream_transport.h 258include/php/main/streams/php_stream_transport.h
259include/php/main/streams/php_stream_userspace.h 259include/php/main/streams/php_stream_userspace.h
260include/php/main/streams/php_streams_int.h 260include/php/main/streams/php_streams_int.h
261include/php/sapi/cli/cli.h 261include/php/sapi/cli/cli.h
 262${PLIST.embed}include/php/sapi/embed/php_embed.h
 263${PLIST.embed}lib/libphp7.so
262lib/php/build/Makefile.global 264lib/php/build/Makefile.global
263lib/php/build/acinclude.m4 265lib/php/build/acinclude.m4
264lib/php/build/ax_check_compile_flag.m4 266lib/php/build/ax_check_compile_flag.m4
265lib/php/build/ax_gcc_func_attribute.m4 267lib/php/build/ax_gcc_func_attribute.m4
266lib/php/build/config.guess 268lib/php/build/config.guess
267lib/php/build/config.sub 269lib/php/build/config.sub
268lib/php/build/libtool.m4 270lib/php/build/libtool.m4
269lib/php/build/ltmain.sh 271lib/php/build/ltmain.sh
270lib/php/build/mkdep.awk 272lib/php/build/mkdep.awk
271lib/php/build/phpize.m4 273lib/php/build/phpize.m4
272lib/php/build/run-tests.php 274lib/php/build/run-tests.php
273lib/php/build/scan_makefile_in.awk 275lib/php/build/scan_makefile_in.awk
274lib/php/build/shtool 276lib/php/build/shtool