update to php-7.3.5

This commit is contained in:
sthen 2019-05-02 11:35:27 +00:00
parent 4005cdb293
commit d91d1a55ed
3 changed files with 7 additions and 38 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.6 2019/04/18 16:26:29 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2019/05/02 11:35:27 sthen Exp $
PORTROACH= limit:^7\.3
PV= 7.3
V= ${PV}.4
V= ${PV}.5
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (php-7.3.4.tar.bz2) = Liw9ghLINknkQ7Ye//vQPfS57dD5x6Z5CB/kyy2hK3g=
SIZE (php-7.3.4.tar.bz2) = 14807811
SHA256 (php-7.3.5.tar.bz2) = Q4C4DvmCZ8OCPDQW6wX3cpunoz3ms9FOyWATIV1iw14=
SIZE (php-7.3.5.tar.bz2) = 14820606

View File

@ -1,39 +1,8 @@
$OpenBSD: patch-acinclude_m4,v 1.2 2019/04/08 23:24:11 sthen Exp $
$OpenBSD: patch-acinclude_m4,v 1.3 2019/05/02 11:35:27 sthen Exp $
Index: acinclude.m4
--- acinclude.m4.orig
+++ acinclude.m4
@@ -967,15 +967,9 @@ dnl ---------------------------------------------- Sha
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
dnl ---------------------------------------------- CLI static module
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
- case "$PHP_SAPI" in
- cgi|embed[)]
- PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,)
- EXT_STATIC="$EXT_STATIC $1;$ext_dir"
- ;;
- *[)]
PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cli)
- ;;
- esac
+ PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,cgi)
+ PHP_ADD_SOURCES($ext_dir,$2,$ac_extra,fpm)
EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
fi
PHP_ADD_BUILD_DIR($ext_builddir)
@@ -1025,12 +1019,6 @@ You either need to build $1 shared or build $2 statica
build to be successful.
])
fi
- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
- AC_MSG_ERROR([
-You've configured extension $1, which depends on extension $2,
-but you've either not enabled $2, or have disabled it.
-])
- fi
dnl Some systems require that we link $2 to $1 when building
])
@@ -2324,9 +2312,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
@@ -2324,9 +2324,9 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no
dnl Fallbacks for different configure options
@ -45,7 +14,7 @@ Index: acinclude.m4
PHP_OPENSSL_DIR=$PHP_IMAP_SSL
fi
@@ -2337,7 +2325,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
@@ -2337,7 +2337,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
dnl If pkg-config is found try using it
if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then