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().
This commit is contained in:
parent
07264de85b
commit
78210f7045
|
@ -86,6 +86,31 @@ if [ $ngx_found = yes ]; then
|
||||||
ee.data.ptr = NULL;
|
ee.data.ptr = NULL;
|
||||||
epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
|
epoll_ctl(efd, EPOLL_CTL_ADD, fd, &ee)"
|
||||||
. auto/feature
|
. 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
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
23
auto/unix
23
auto/unix
|
@ -582,29 +582,6 @@ Currently file AIO is supported on FreeBSD 4.3+ and Linux 2.6.22+ only
|
||||||
END
|
END
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue