pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

unit: Do not use epoll on SmartOS/illumos.



Module Name:	pkgsrc-wip
Committed By:	Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By:	otis
Date:		Tue Dec 8 21:09:22 2020 +0000
Changeset:	f18c5f3485053507e791f253b5ff8186da73f5d3

Modified Files:
	unit/distinfo
Added Files:
	unit/patches/patch-src_nxt__service.c

Log Message:
unit: Do not use epoll on SmartOS/illumos.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f18c5f3485053507e791f253b5ff8186da73f5d3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 unit/distinfo                         |  1 +
 unit/patches/patch-src_nxt__service.c | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diffs:
diff --git a/unit/distinfo b/unit/distinfo
index d396900a5e..86748ccc4e 100644
--- a/unit/distinfo
+++ b/unit/distinfo
@@ -9,6 +9,7 @@ SHA1 (patch-src_nxt__cert.c) = c91e45f148a079b543a0d3cb277388bffb3e2854
 SHA1 (patch-src_nxt__conf__validation.c) = 99662fc0d975604fea0708a810e916991d0bf578
 SHA1 (patch-src_nxt__file.c) = 4321feeb6724378009cefacfe23470932faf35ef
 SHA1 (patch-src_nxt__router.c) = 366241f155bccf6a3291e37fef5993eb1c364b99
+SHA1 (patch-src_nxt__service.c) = ef2e54365340e2f76231af006f94d795130c04ce
 SHA1 (patch-src_nxt__unit.c) = d76768c55cd1176b83fefa2a0ccf7e7027d66331
 SHA1 (patch-src_nxt__unix.h) = c0db5bc4d9c45a3ead48627567284d8b3041b0a0
 SHA1 (patch-src_nxt__websocket__header.h) = 1b50405b187cc8a662372a1c20ab7737278135ae
diff --git a/unit/patches/patch-src_nxt__service.c b/unit/patches/patch-src_nxt__service.c
new file mode 100644
index 0000000000..0a11d406b2
--- /dev/null
+++ b/unit/patches/patch-src_nxt__service.c
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- src/nxt_service.c.orig	2020-11-19 18:12:30.000000000 +0000
++++ src/nxt_service.c
+@@ -13,17 +13,17 @@ static const nxt_service_t  nxt_services
+     { "engine", "kqueue", &nxt_kqueue_engine },
+ #endif
+ 
+-#if (NXT_HAVE_EPOLL_EDGE)
++#if (NXT_HAVE_EPOLL_EDGE) && !(NXT_SOLARIS)
+     { "engine", "epoll", &nxt_epoll_edge_engine },
+     { "engine", "epoll_edge", &nxt_epoll_edge_engine },
+     { "engine", "epoll_level", &nxt_epoll_level_engine },
+ 
+-#elif (NXT_HAVE_EPOLL)
++#elif (NXT_HAVE_EPOLL) && !(NXT_SOLARIS)
+     { "engine", "epoll", &nxt_epoll_level_engine },
+     { "engine", "epoll_level", &nxt_epoll_level_engine },
+ #endif
+ 
+-#if (NXT_HAVE_EVENTPORT)
++#if (NXT_HAVE_EVENTPORT) || (NXT_SOLARIS)
+     { "engine", "eventport", &nxt_eventport_engine },
+ #endif
+ 


Home | Main Index | Thread Index | Old Index