pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/lang/php73
Module Name: pkgsrc
Committed By: otis
Date: Fri Nov 20 15:34:11 UTC 2020
Modified Files:
pkgsrc/lang/php73: Makefile Makefile.php PLIST
Log Message:
php73: add default-off php-embed option to install embed SAPI
Requested by Sergey Osokin in PR 55508.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/lang/php73/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php73/Makefile.php
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/php73/PLIST
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/lang/php73/Makefile
diff -u pkgsrc/lang/php73/Makefile:1.14 pkgsrc/lang/php73/Makefile:1.15
--- pkgsrc/lang/php73/Makefile:1.14 Thu Nov 5 09:06:58 2020
+++ pkgsrc/lang/php73/Makefile Fri Nov 20 15:34:11 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2020/11/05 09:06:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/20 15:34:11 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.3
LICENSE= php
Index: pkgsrc/lang/php73/Makefile.php
diff -u pkgsrc/lang/php73/Makefile.php:1.4 pkgsrc/lang/php73/Makefile.php:1.5
--- pkgsrc/lang/php73/Makefile.php:1.4 Sun Feb 9 22:01:10 2020
+++ pkgsrc/lang/php73/Makefile.php Fri Nov 20 15:34:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.4 2020/02/09 22:01:10 rillig Exp $
+# $NetBSD: Makefile.php,v 1.5 2020/11/20 15:34:11 otis Exp $
# used by lang/php73/Makefile
# used by www/ap-php/Makefile
# used by www/php-fpm/Makefile
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-pcre-regex=${BUI
GNU_CONFIGURE_STRICT= no
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
@@ -110,5 +110,19 @@ CONFIGURE_ARGS+= --with-password-argon2=
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"
Index: pkgsrc/lang/php73/PLIST
diff -u pkgsrc/lang/php73/PLIST:1.1 pkgsrc/lang/php73/PLIST:1.2
--- pkgsrc/lang/php73/PLIST:1.1 Sat Dec 15 17:12:44 2018
+++ pkgsrc/lang/php73/PLIST Fri Nov 20 15:34:11 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/12/15 17:12:44 taca Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/20 15:34:11 otis Exp $
bin/phar
bin/phar.phar
bin/php
@@ -259,6 +259,8 @@ include/php/main/streams/php_stream_tran
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/acinclude.m4
lib/php/build/ax_check_compile_flag.m4
Home |
Main Index |
Thread Index |
Old Index