pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/php74 php74: add default-off php-embed option to ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/73ca1d13bf4d
branches:  trunk
changeset: 442208:73ca1d13bf4d
user:      otis <otis%pkgsrc.org@localhost>
date:      Fri Nov 20 15:13:31 2020 +0000

description:
php74: add default-off php-embed option to install embed SAPI

Requested by Sergey Osokin in PR 55508.

diffstat:

 lang/php74/Makefile     |   4 ++--
 lang/php74/Makefile.php |  18 ++++++++++++++++--
 lang/php74/PLIST        |   4 +++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diffs (72 lines):

diff -r e796e71215a8 -r 73ca1d13bf4d lang/php74/Makefile
--- a/lang/php74/Makefile       Fri Nov 20 14:55:02 2020 +0000
+++ b/lang/php74/Makefile       Fri Nov 20 15:13:31 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2020/11/05 09:06:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.9 2020/11/20 15:13:31 otis Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=               php-${PHP_VERSION:S/RC/rc/}
-PKGREVISION=           1
+PKGREVISION=           2
 
 COMMENT=               PHP Hypertext Preprocessor version 7.4
 LICENSE=               php
diff -r e796e71215a8 -r 73ca1d13bf4d lang/php74/Makefile.php
--- a/lang/php74/Makefile.php   Fri Nov 20 14:55:02 2020 +0000
+++ b/lang/php74/Makefile.php   Fri Nov 20 15:13:31 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.2 2020/01/21 14:16:26 taca Exp $
+# $NetBSD: Makefile.php,v 1.3 2020/11/20 15:13:31 otis Exp $
 # used by lang/php74/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -53,7 +53,7 @@
 #CONFIGURE_ARGS+=      --with-pcre-regex=${BUILDLINK_PREFIX.pcre2}
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline argon2 php-embed
 PKG_SUPPORTED_OPTIONS+=        disable-filter-url
 PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
 
@@ -109,5 +109,19 @@
 CFLAGS+=               -DDISABLE_FILTER_URL
 .endif
 
+PLIST_VARS+=    embed
+
+.if !empty(PKG_OPTIONS:Mphp-embed)
+CONFIGURE_ARGS+=       --enable-embed
+INSTALLATION_DIRS+=    include/php/sapi/embed
+PLIST.embed=           yes
+
+.PHONY: post-install-embed
+post-install: post-install-embed
+post-install-embed:
+       ${INSTALL_DATA} ${WRKSRC}/sapi/embed/php_embed.h ${DESTDIR}${PREFIX}/include/php/sapi/embed/
+       ${INSTALL_LIB} ${WRKSRC}/libs/libphp7.so ${DESTDIR}${PREFIX}/lib/
+.endif
+
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"
diff -r e796e71215a8 -r 73ca1d13bf4d lang/php74/PLIST
--- a/lang/php74/PLIST  Fri Nov 20 14:55:02 2020 +0000
+++ b/lang/php74/PLIST  Fri Nov 20 15:13:31 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/01/21 14:16:26 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/11/20 15:13:31 otis Exp $
 bin/phar
 bin/phar.phar
 bin/php
@@ -255,6 +255,8 @@
 include/php/main/streams/php_stream_userspace.h
 include/php/main/streams/php_streams_int.h
 include/php/sapi/cli/cli.h
+${PLIST.embed}include/php/sapi/embed/php_embed.h
+${PLIST.embed}lib/libphp7.so
 lib/php/build/Makefile.global
 lib/php/build/ax_check_compile_flag.m4
 lib/php/build/ax_gcc_func_attribute.m4



Home | Main Index | Thread Index | Old Index