diff options
| -rw-r--r-- | devel/pecl-swoole/Makefile | 3 | ||||
| -rw-r--r-- | devel/pecl-swoole/distinfo | 6 | ||||
| -rw-r--r-- | devel/pecl-swoole/files/patch-config.m4 | 18 | ||||
| -rw-r--r-- | devel/pecl-swoole/files/patch-include_swoole.h | 20 | ||||
| -rw-r--r-- | devel/pecl-swoole/files/patch-src_network_Server.c | 16 | ||||
| -rw-r--r-- | devel/pecl-swoole/files/patch-swoole__config.h | 11 | ||||
| -rw-r--r-- | devel/pecl-swoole/files/patch-swoole__process.c | 15 |
7 files changed, 6 insertions, 83 deletions
diff --git a/devel/pecl-swoole/Makefile b/devel/pecl-swoole/Makefile index 38829bbea260..89bbed6b3d8e 100644 --- a/devel/pecl-swoole/Makefile +++ b/devel/pecl-swoole/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= swoole -PORTVERSION= 1.9.5 -PORTREVISION= 1 +PORTVERSION= 1.9.6 CATEGORIES= devel net MASTER_SITES= http://pecl.php.net/get/ PKGNAMEPREFIX= pecl- diff --git a/devel/pecl-swoole/distinfo b/devel/pecl-swoole/distinfo index 4c0160d63c7d..b2d018cf201d 100644 --- a/devel/pecl-swoole/distinfo +++ b/devel/pecl-swoole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486302935 -SHA256 (PECL/swoole-1.9.5.tgz) = ffc11770606478938e7c5437b29e486d1737ddc3ebb4a8f51bcebe127c5d1a45 -SIZE (PECL/swoole-1.9.5.tgz) = 542481 +TIMESTAMP = 1488076230 +SHA256 (PECL/swoole-1.9.6.tgz) = b6ad22d6d76c9ad8ad3408854a9ffaa220ae0b02e543fb5a87115452e7429174 +SIZE (PECL/swoole-1.9.6.tgz) = 550874 diff --git a/devel/pecl-swoole/files/patch-config.m4 b/devel/pecl-swoole/files/patch-config.m4 index 9d5e05d598d0..811ead130837 100644 --- a/devel/pecl-swoole/files/patch-config.m4 +++ b/devel/pecl-swoole/files/patch-config.m4 @@ -1,20 +1,6 @@ ---- config.m4.orig 2017-01-24 02:05:48 UTC +--- config.m4.orig 2017-02-24 07:21:23 UTC +++ config.m4 -@@ -85,7 +85,13 @@ AC_DEFUN([AC_SWOOLE_CPU_AFFINITY], - AC_MSG_CHECKING([for cpu affinity]) - AC_TRY_COMPILE( - [ -+ #ifdef __FreeBSD__ -+ #include <sys/types.h> -+ #include <sys/cpuset.h> -+ typedef cpuset_t cpu_set_t; -+ #else - #include <sched.h> -+ #endif - ], [ - cpu_set_t cpu_set; - CPU_ZERO(&cpu_set); -@@ -178,7 +184,7 @@ if test "$PHP_SWOOLE" != "no"; then +@@ -232,7 +232,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])) diff --git a/devel/pecl-swoole/files/patch-include_swoole.h b/devel/pecl-swoole/files/patch-include_swoole.h deleted file mode 100644 index 2a661b1dd492..000000000000 --- a/devel/pecl-swoole/files/patch-include_swoole.h +++ /dev/null @@ -1,20 +0,0 @@ ---- include/swoole.h.orig 2017-01-24 02:05:48 UTC -+++ include/swoole.h -@@ -40,7 +40,17 @@ extern "C" { - #include <assert.h> - #include <time.h> - #include <pthread.h> -+ -+#if defined(HAVE_CPU_AFFINITY) -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/cpuset.h> -+#include <pthread_np.h> -+typedef cpuset_t cpu_set_t; -+#else - #include <sched.h> -+#endif -+#endif - - #include <arpa/inet.h> - #include <netinet/in.h> diff --git a/devel/pecl-swoole/files/patch-src_network_Server.c b/devel/pecl-swoole/files/patch-src_network_Server.c deleted file mode 100644 index 0dae3fa5df46..000000000000 --- a/devel/pecl-swoole/files/patch-src_network_Server.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/network/Server.c.orig 2017-02-06 09:30:50 UTC -+++ src/network/Server.c -@@ -522,7 +522,13 @@ int swServer_worker_init(swServer *serv, - { - CPU_SET(SwooleWG.id % SW_CPU_NUM, &cpu_set); - } -+ -+#ifdef __FreeBSD__ -+ if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, -+ sizeof(cpu_set), &cpu_set) < 0) -+#else - if (sched_setaffinity(getpid(), sizeof(cpu_set), &cpu_set) < 0) -+#endif - { - swSysError("sched_setaffinity() failed."); - } diff --git a/devel/pecl-swoole/files/patch-swoole__config.h b/devel/pecl-swoole/files/patch-swoole__config.h deleted file mode 100644 index 8579d544d183..000000000000 --- a/devel/pecl-swoole/files/patch-swoole__config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- swoole_config.h.orig 2017-01-24 02:05:48 UTC -+++ swoole_config.h -@@ -19,7 +19,7 @@ - #ifndef __clang__ - //gcc version check - #if defined(__GNUC__) && (__GNUC__ < 3 || (__GNUC__ == 4 && __GNUC_MINOR__ < 4)) --#error "GCC 4.4 or later required." -+//#error "GCC 4.4 or later required." - #endif - #endif - diff --git a/devel/pecl-swoole/files/patch-swoole__process.c b/devel/pecl-swoole/files/patch-swoole__process.c deleted file mode 100644 index ddd1d1678bb2..000000000000 --- a/devel/pecl-swoole/files/patch-swoole__process.c +++ /dev/null @@ -1,15 +0,0 @@ ---- swoole_process.c.orig 2017-02-06 09:32:48 UTC -+++ swoole_process.c -@@ -963,7 +963,12 @@ static PHP_METHOD(swoole_process, setaff - CPU_SET(Z_LVAL_P(value), &cpu_set); - SW_HASHTABLE_FOREACH_END(); - -+#ifdef __FreeBSD__ -+ if (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, -+ sizeof(cpu_set), &cpu_set) < 0) -+#else - if (sched_setaffinity(getpid(), sizeof(cpu_set), &cpu_set) < 0) -+#endif - { - swoole_php_sys_error(E_WARNING, "sched_setaffinity() failed."); - RETURN_FALSE; |