diff --git a/devel/pecl-swoole/files/patch-config.m4 b/devel/pecl-swoole/files/patch-config.m4 index c4561ce05a2c..502002342711 100644 --- a/devel/pecl-swoole/files/patch-config.m4 +++ b/devel/pecl-swoole/files/patch-config.m4 @@ -1,11 +1,11 @@ ---- 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])) - AC_CHECK_LIB(c, backtrace, AC_DEFINE(HAVE_EXECINFO, 1, [have execinfo])) + AC_CHECK_LIB(execinfo, backtrace, AC_DEFINE(HAVE_EXECINFO, 1, [have execinfo])) AC_CHECK_LIB(c, daemon, AC_DEFINE(HAVE_DAEMON, 1, [have daemon])) AC_CHECK_LIB(c, mkostemp, AC_DEFINE(HAVE_MKOSTEMP, 1, [have mkostemp])) AC_CHECK_LIB(c, inotify_init, AC_DEFINE(HAVE_INOTIFY, 1, [have inotify])) diff --git a/devel/pecl-swoole/files/patch-ext-src_php__swoole.h b/devel/pecl-swoole/files/patch-ext-src_php__swoole.h new file mode 100644 index 000000000000..45f10303263f --- /dev/null +++ b/devel/pecl-swoole/files/patch-ext-src_php__swoole.h @@ -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) + {