pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
wip/unit: Update to 1.22.0
Module Name: pkgsrc-wip
Committed By: Juraj Lutter <otis%NetBSD.org@localhost>
Pushed By: otis
Date: Thu Feb 4 21:37:28 2021 +0000
Changeset: 9c7eb8b9e5feccd75934a3c5d7c02b37d5de595b
Modified Files:
unit/distinfo
Added Files:
unit/patches/patch-auto_events
Log Message:
wip/unit: Update to 1.22.0
And while here, also do not use epoll and eventfd on
SunOS/SmartOS/illumos where eventports are preferred.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9c7eb8b9e5feccd75934a3c5d7c02b37d5de595b
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-auto_events | 128 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 129 insertions(+)
diffs:
diff --git a/unit/distinfo b/unit/distinfo
index 57bfeaf171..0a0f84bf10 100644
--- a/unit/distinfo
+++ b/unit/distinfo
@@ -4,6 +4,7 @@ SHA1 (unit-1.22.0.tar.gz) = ab38a89c12d15a56fdc1a51dd6fa8a689e02abae
RMD160 (unit-1.22.0.tar.gz) = a658f1c8f898e381a017303264b0d7202627cdbb
SHA512 (unit-1.22.0.tar.gz) = 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5
Size (unit-1.22.0.tar.gz) = 824763 bytes
+SHA1 (patch-auto_events) = 0347dfefbedaacd206c8c2bfd8ea38b18995dd9f
SHA1 (patch-auto_os_conf) = 6d1cd7aef662a60d4288014eb6fadbe8c1268e55
SHA1 (patch-src_nxt__cert.c) = c91e45f148a079b543a0d3cb277388bffb3e2854
SHA1 (patch-src_nxt__conf__validation.c) = 99662fc0d975604fea0708a810e916991d0bf578
diff --git a/unit/patches/patch-auto_events b/unit/patches/patch-auto_events
new file mode 100644
index 0000000000..2595a4c477
--- /dev/null
+++ b/unit/patches/patch-auto_events
@@ -0,0 +1,128 @@
+$NetBSD$
+
+Prefer eventports on SunOS
+
+--- auto/events.orig 2021-02-04 15:22:33.000000000 +0000
++++ auto/events
+@@ -5,69 +5,70 @@
+
+ # Linux epoll.
+
+-nxt_feature="Linux epoll"
+-nxt_feature_name=NXT_HAVE_EPOLL
+-nxt_feature_run=
+-nxt_feature_incs=
+-nxt_feature_libs=
+-nxt_feature_test="#include <sys/epoll.h>
+- #include <unistd.h>
+-
+- int main() {
+- int n;
+-
+- n = epoll_create(1);
+- close(n);
+- return 0;
+- }"
+-. auto/feature
+-
+-if [ $nxt_found = yes ]; then
+- NXT_HAVE_EPOLL=YES
+-
+- nxt_feature="Linux signalfd()"
+- nxt_feature_name=NXT_HAVE_SIGNALFD
++# Do not use epoll on SunOS/illumos/Smartos
++# as eventports are preferred there.
++NXT_HAVE_EPOLL=NO
++if [ $NXT_SYSTEM != "SunOS" ]; then
++ nxt_feature="Linux epoll"
++ nxt_feature_name=NXT_HAVE_EPOLL
+ nxt_feature_run=
+ nxt_feature_incs=
+ nxt_feature_libs=
+- nxt_feature_test="#include <signal.h>
+- #include <sys/signalfd.h>
++ nxt_feature_test="#include <sys/epoll.h>
+ #include <unistd.h>
+-
+- int main() {
+- int n;
+- sigset_t mask;
+-
+- sigemptyset(&mask);
+- n = signalfd(-1, &mask, 0);
+- close(n);
+- return 0;
+- }"
+- . auto/feature
+-
+-
+- nxt_feature="Linux eventfd()"
+- nxt_feature_name=NXT_HAVE_EVENTFD
+- nxt_feature_run=
+- nxt_feature_incs=
+- nxt_feature_libs=
+- nxt_feature_test="#include <sys/eventfd.h>
+- #include <unistd.h>
+-
++
+ int main() {
+ int n;
+-
+- n = eventfd(0, 0);
++
++ n = epoll_create(1);
+ close(n);
+ return 0;
+ }"
+ . auto/feature
+-
+-else
+- NXT_HAVE_EPOLL=NO
++
++ if [ $nxt_found = yes ]; then
++ NXT_HAVE_EPOLL=YES
++
++ nxt_feature="Linux signalfd()"
++ nxt_feature_name=NXT_HAVE_SIGNALFD
++ nxt_feature_run=
++ nxt_feature_incs=
++ nxt_feature_libs=
++ nxt_feature_test="#include <signal.h>
++ #include <sys/signalfd.h>
++ #include <unistd.h>
++
++ int main() {
++ int n;
++ sigset_t mask;
++
++ sigemptyset(&mask);
++ n = signalfd(-1, &mask, 0);
++ close(n);
++ return 0;
++ }"
++ . auto/feature
++
++
++ nxt_feature="Linux eventfd()"
++ nxt_feature_name=NXT_HAVE_EVENTFD
++ nxt_feature_run=
++ nxt_feature_incs=
++ nxt_feature_libs=
++ nxt_feature_test="#include <sys/eventfd.h>
++ #include <unistd.h>
++
++ int main() {
++ int n;
++
++ n = eventfd(0, 0);
++ close(n);
++ return 0;
++ }"
++ . auto/feature
++ fi
+ fi
+
+-
+ # FreeBSD, MacOSX, NetBSD, OpenBSD kqueue.
+
+ nxt_feature="kqueue"
Home |
Main Index |
Thread Index |
Old Index