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

python · Jan 7, 2022 · 994f90c · 994f90c
1 parent f4e325c
commit 994f90c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/Misc/NEWS.d/next/Build/2022-01-07-08-33-45.bpo-45723.uq2nBU.rst b/Misc/NEWS.d/next/Build/2022-01-07-08-33-45.bpo-45723.uq2nBU.rst
@@ -0,0 +1 @@
+Fixed a regression in ``configure`` check for :func:`select.epoll`.
diff --git a/configure b/configure
@@ -13850,9 +13850,9 @@ fi
 
 
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
-$as_echo_n "checking for epoll... " >&6; }
-if ${ac_cv_func_epoll+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll_create" >&5
+$as_echo_n "checking for epoll_create... " >&6; }
+if ${ac_cv_func_epoll_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13861,22 +13861,22 @@ else
 int
 main ()
 {
-void *x=epoll
+void *x=epoll_create
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_func_epoll=yes
+  ac_cv_func_epoll_create=yes
 else
-  ac_cv_func_epoll=no
+  ac_cv_func_epoll_create=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_epoll" >&5
-$as_echo "$ac_cv_func_epoll" >&6; }
-  if test "x$ac_cv_func_epoll" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_epoll_create" >&5
+$as_echo "$ac_cv_func_epoll_create" >&6; }
+  if test "x$ac_cv_func_epoll_create" = xyes; then :
 
 $as_echo "#define HAVE_EPOLL 1" >>confdefs.h
 

diff --git a/configure.ac b/configure.ac
@@ -4089,7 +4089,7 @@ PY_CHECK_FUNC([symlink], [#include <unistd.h>])
 PY_CHECK_FUNC([fchdir], [#include <unistd.h>])
 PY_CHECK_FUNC([fsync], [#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([kqueue],[
 #include <sys/types.h>

diff --git a/pyconfig.h.in b/pyconfig.h.in
@@ -293,7 +293,7 @@
 /* Define to 1 if you have the <endian.h> header file. */
 #undef HAVE_ENDIAN_H
 
-/* Define if you have the 'epoll' function. */
+/* Define if you have the 'epoll_create' function. */
 #undef HAVE_EPOLL
 
 /* Define if you have the 'epoll_create1' function. */
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed a regression in ``configure`` check for :func:`select.epoll`.