summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2021-04-05 20:14:16 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2021-04-05 20:14:16 +0300
commitca9bf16f09ef2b0755bfe880c68dc71b9c46f879 (patch)
treef688710afbb22a95ea0c765587aa4fa4d8ad36e4
parent4af67214ad3d7f0f525bea777d5a43aa7a702ecf (diff)
Configure: fixed --test-build-epoll on FreeBSD 13.
In FreeBSD 13, eventfd(2) was added, and this breaks build with --test-build-epoll and without --with-file-aio. Fix is to move eventfd(2) detection to auto/os/linux, as it is used only on Linux as a notification mechanism for epoll().
-rw-r--r--auto/os/linux25
-rw-r--r--auto/unix23
2 files changed, 25 insertions, 23 deletions
diff --git a/auto/os/linux b/auto/os/linux
index 5e280eca7..74b587026 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -86,6 +86,31 @@ if [ $ngx_found = yes ]; then
ee.data.ptr = NULL;
epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
. auto/feature
+
+
+ # eventfd()
+
+ ngx_feature="eventfd()"
+ ngx_feature_name="NGX_HAVE_EVENTFD"
+ ngx_feature_run=no
+ ngx_feature_incs="#include <sys/eventfd.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+ ngx_feature_test="(void) eventfd(0, 0)"
+ . auto/feature
+
+ if [ $ngx_found = yes ]; then
+ have=NGX_HAVE_SYS_EVENTFD_H . auto/have
+ fi
+
+
+ if [ $ngx_found = no ]; then
+
+ ngx_feature="eventfd() (SYS_eventfd)"
+ ngx_feature_incs="#include <sys/syscall.h>"
+ ngx_feature_test="(void) SYS_eventfd"
+ . auto/feature
+ fi
fi
diff --git a/auto/unix b/auto/unix
index 9c402e787..867101982 100644
--- a/auto/unix
+++ b/auto/unix
@@ -582,29 +582,6 @@ Currently file AIO is supported on FreeBSD 4.3+ and Linux 2.6.22+ only
END
exit 1
fi
-
-else
-
- ngx_feature="eventfd()"
- ngx_feature_name="NGX_HAVE_EVENTFD"
- ngx_feature_run=no
- ngx_feature_incs="#include <sys/eventfd.h>"
- ngx_feature_path=
- ngx_feature_libs=
- ngx_feature_test="(void) eventfd(0, 0)"
- . auto/feature
-
- if [ $ngx_found = yes ]; then
- have=NGX_HAVE_SYS_EVENTFD_H . auto/have
- fi
-
- if [ $ngx_found = no ]; then
-
- ngx_feature="eventfd() (SYS_eventfd)"
- ngx_feature_incs="#include <sys/syscall.h>"
- ngx_feature_test="(void) SYS_eventfd"
- . auto/feature
- fi
fi