Rebase against 3660176e09bc02e71586b4cf42f58c9498481af6.

This commit is contained in:
Alistair Leslie-Hughes
2021-10-07 09:15:30 +11:00
parent 7750a01cea
commit c61d12592b
24 changed files with 365 additions and 428 deletions

View File

@@ -1,4 +1,4 @@
From 4d8244be2c89fe601d75bd17631d87f504dcd63a Mon Sep 17 00:00:00 2001
From 4b23aac811b441d63bc451bb2126d2da04734201 Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Wed, 13 Jun 2018 10:44:49 -0500
Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
@@ -13,10 +13,10 @@ Although perhaps we shouldn't since the server doesn't do this.
3 files changed, 89 insertions(+)
diff --git a/configure b/configure
index 97b5dcfb38b..367008886d7 100755
index c99ee5858e7..e1cc8737eb1 100755
--- a/configure
+++ b/configure
@@ -7543,6 +7543,7 @@ for ac_header in \
@@ -7525,6 +7525,7 @@ for ac_header in \
sys/cdio.h \
sys/epoll.h \
sys/event.h \
@@ -24,15 +24,15 @@ index 97b5dcfb38b..367008886d7 100755
sys/filio.h \
sys/ioctl.h \
sys/ipc.h \
@@ -18009,6 +18010,7 @@ for ac_func in \
@@ -17912,6 +17913,7 @@ for ac_func in \
port_create \
posix_fadvise \
posix_fallocate \
+ ppoll \
prctl \
proc_pidinfo \
readlink \
@@ -18402,6 +18404,72 @@ fi
sched_yield \
@@ -18257,6 +18259,72 @@ fi
;;
esac
@@ -106,10 +106,10 @@ index 97b5dcfb38b..367008886d7 100755
then
if ${LDAP_CFLAGS:+false} :; then :
diff --git a/configure.ac b/configure.ac
index 0e65c78a81d..a3c9a627117 100644
index bf9e8103606..adddfacc6fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -510,6 +510,7 @@ AC_CHECK_HEADERS(\
@@ -498,6 +498,7 @@ AC_CHECK_HEADERS(\
sys/cdio.h \
sys/epoll.h \
sys/event.h \
@@ -117,15 +117,15 @@ index 0e65c78a81d..a3c9a627117 100644
sys/filio.h \
sys/ioctl.h \
sys/ipc.h \
@@ -2212,6 +2213,7 @@ AC_CHECK_FUNCS(\
@@ -2173,6 +2174,7 @@ AC_CHECK_FUNCS(\
port_create \
posix_fadvise \
posix_fallocate \
+ ppoll \
prctl \
proc_pidinfo \
readlink \
@@ -2262,6 +2264,16 @@ case $host_os in
renameat \
@@ -2215,6 +2217,16 @@ case $host_os in
;;
esac
@@ -143,10 +143,10 @@ index 0e65c78a81d..a3c9a627117 100644
if test "x$with_ldap" != "xno"
then
diff --git a/include/config.h.in b/include/config.h.in
index f66444fd715..bf8fc85e6c5 100644
index fc3749895a3..608a255f1f7 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -507,6 +507,9 @@
@@ -486,6 +486,9 @@
/* Define to 1 if you have the `posix_fallocate' function. */
#undef HAVE_POSIX_FALLOCATE
@@ -156,7 +156,7 @@ index f66444fd715..bf8fc85e6c5 100644
/* Define to 1 if you have the `prctl' function. */
#undef HAVE_PRCTL
@@ -585,6 +588,9 @@
@@ -561,6 +564,9 @@
/* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
#undef HAVE_SG_IO_HDR_T_INTERFACE_ID
@@ -166,7 +166,7 @@ index f66444fd715..bf8fc85e6c5 100644
/* Define if sigaddset is supported */
#undef HAVE_SIGADDSET
@@ -749,6 +755,9 @@
@@ -716,6 +722,9 @@
/* Define to 1 if you have the <sys/epoll.h> header file. */
#undef HAVE_SYS_EPOLL_H