Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-45723: Fix detection of epoll (#30449)

This commit is contained in:
Christian Heimes 2022-01-07 10:15:20 +02:00 committed by GitHub
parent f4e325c21d
commit 994f90c077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2022-01-07-08-33-45.bpo-45723.uq2nBU.rst Normal file
View File

@ -0,0 +1 @@
Fixed a regression in ``configure`` check for :func:`select.epoll`.

18
configure vendored
View File

@ -13850,9 +13850,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll_create" >&5
$as_echo_n "checking for epoll... " >&6; } $as_echo_n "checking for epoll_create... " >&6; }
if ${ac_cv_func_epoll+:} false; then : if ${ac_cv_func_epoll_create+:} false; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
else else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@ -13861,22 +13861,22 @@ else
int int
main () main ()
{ {
void *x=epoll void *x=epoll_create
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_func_epoll=yes ac_cv_func_epoll_create=yes
else else
ac_cv_func_epoll=no ac_cv_func_epoll_create=no
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_epoll" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_epoll_create" >&5
$as_echo "$ac_cv_func_epoll" >&6; } $as_echo "$ac_cv_func_epoll_create" >&6; }
if test "x$ac_cv_func_epoll" = xyes; then : if test "x$ac_cv_func_epoll_create" = xyes; then :
$as_echo "#define HAVE_EPOLL 1" >>confdefs.h $as_echo "#define HAVE_EPOLL 1" >>confdefs.h

2
configure.ac
View File

@ -4089,7 +4089,7 @@ PY_CHECK_FUNC([symlink], [#include <unistd.h>])
PY_CHECK_FUNC([fchdir], [#include <unistd.h>]) PY_CHECK_FUNC([fchdir], [#include <unistd.h>])
PY_CHECK_FUNC([fsync], [#include <unistd.h>]) PY_CHECK_FUNC([fsync], [#include <unistd.h>])
PY_CHECK_FUNC([fdatasync], [#include <unistd.h>]) PY_CHECK_FUNC([fdatasync], [#include <unistd.h>])
PY_CHECK_FUNC([epoll], [#include <sys/epoll.h>]) PY_CHECK_FUNC([epoll_create], [#include <sys/epoll.h>], [HAVE_EPOLL])
PY_CHECK_FUNC([epoll_create1], [#include <sys/epoll.h>]) PY_CHECK_FUNC([epoll_create1], [#include <sys/epoll.h>])
PY_CHECK_FUNC([kqueue],[ PY_CHECK_FUNC([kqueue],[
#include <sys/types.h> #include <sys/types.h>

2
pyconfig.h.in
View File

@ -293,7 +293,7 @@
/* Define to 1 if you have the <endian.h> header file. */ /* Define to 1 if you have the <endian.h> header file. */
#undef HAVE_ENDIAN_H #undef HAVE_ENDIAN_H
/* Define if you have the 'epoll' function. */ /* Define if you have the 'epoll_create' function. */
#undef HAVE_EPOLL #undef HAVE_EPOLL
/* Define if you have the 'epoll_create1' function. */ /* Define if you have the 'epoll_create1' function. */