Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Nov 2020 13:40:35 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r556052 - head/devel/pecl-swoole/files
Message-ID:  <202011221340.0AMDeZqn069253@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Sun Nov 22 13:40:35 2020
New Revision: 556052
URL: https://svnweb.freebsd.org/changeset/ports/556052

Log:
  Add a patch for php80. (build issue)

Added:
  head/devel/pecl-swoole/files/patch-ext-src_php__swoole.h   (contents, props changed)
Modified:
  head/devel/pecl-swoole/files/patch-config.m4

Modified: head/devel/pecl-swoole/files/patch-config.m4
==============================================================================
--- head/devel/pecl-swoole/files/patch-config.m4	Sun Nov 22 13:28:57 2020	(r556051)
+++ head/devel/pecl-swoole/files/patch-config.m4	Sun Nov 22 13:40:35 2020	(r556052)
@@ -1,6 +1,6 @@
---- config.m4.orig	2020-10-30 03:15:28 UTC
+--- config.m4.orig	2020-11-20 11:01:53 UTC
 +++ config.m4
-@@ -271,7 +271,7 @@ if test "$PHP_SWOOLE" != "no"; then
+@@ -287,7 +287,7 @@ if test "$PHP_SWOOLE" != "no"; then
      AC_CHECK_LIB(c, poll, AC_DEFINE(HAVE_POLL, 1, [have poll]))
      AC_CHECK_LIB(c, sendfile, AC_DEFINE(HAVE_SENDFILE, 1, [have sendfile]))
      AC_CHECK_LIB(c, kqueue, AC_DEFINE(HAVE_KQUEUE, 1, [have kqueue]))

Added: head/devel/pecl-swoole/files/patch-ext-src_php__swoole.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/pecl-swoole/files/patch-ext-src_php__swoole.h	Sun Nov 22 13:40:35 2020	(r556052)
@@ -0,0 +1,16 @@
+--- ext-src/php_swoole.h.orig	2020-11-22 13:36:39 UTC
++++ ext-src/php_swoole.h
+@@ -912,10 +912,11 @@ static sw_inline zend_bool sw_zend_is_callable_at_fram
+ {
+     zend_string *name;
+     zend_bool ret;
+-#if PHP_VERSION_ID < 80000
++#if PHP_VERSION_ID < 80001
+     ret = zend_is_callable_ex(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, check_flags, &name, fci_cache, error);
+ #else
+-    ret = zend_is_callable_at_frame(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, frame, check_flags, &name, fci_cache, error);
++    ret = zend_is_callable_at_frame(zcallable, zobject ? Z_OBJ_P(zobject) : NULL, frame, check_flags, fci_cache, error);
++    name = zend_get_callable_name_ex(zcallable, zobject);
+ #endif
+     if (callable_name)
+     {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011221340.0AMDeZqn069253>