Rebase against a87bafc5b92c9f2deaa399e32a8ec42d28f7ea45.

This commit is contained in:
Alistair Leslie-Hughes
2021-08-25 09:53:24 +10:00
parent 5c01355ada
commit 5a5c5a5743
6 changed files with 27 additions and 190 deletions

View File

@@ -1,4 +1,4 @@
From 723ccff12d0b9516490e34519e244a6486d11b8b Mon Sep 17 00:00:00 2001
From f8f619802b42448514fdab786a2c593658c33625 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 5672688a0d7..24ae489c3a9 100755
index c9418c0f225..65a20ef25c8 100755
--- a/configure
+++ b/configure
@@ -7467,6 +7467,7 @@ for ac_header in \
@@ -7543,6 +7543,7 @@ for ac_header in \
sys/cdio.h \
sys/epoll.h \
sys/event.h \
@@ -24,15 +24,15 @@ index 5672688a0d7..24ae489c3a9 100755
sys/filio.h \
sys/ioctl.h \
sys/ipc.h \
@@ -17815,6 +17816,7 @@ for ac_func in \
pipe2 \
@@ -18011,6 +18012,7 @@ for ac_func in \
poll \
port_create \
posix_fadvise \
+ ppoll \
prctl \
pread \
proc_pidinfo \
@@ -18224,6 +18226,72 @@ fi
@@ -18411,6 +18413,72 @@ fi
;;
esac
@@ -106,10 +106,10 @@ index 5672688a0d7..24ae489c3a9 100755
then
if ${LDAP_CFLAGS:+false} :; then :
diff --git a/configure.ac b/configure.ac
index 7a03cbc1cab..bfa64a8d68a 100644
index a7c3be91b7e..0845cc83554 100644
--- a/configure.ac
+++ b/configure.ac
@@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\
@@ -512,6 +512,7 @@ AC_CHECK_HEADERS(\
sys/cdio.h \
sys/epoll.h \
sys/event.h \
@@ -117,15 +117,15 @@ index 7a03cbc1cab..bfa64a8d68a 100644
sys/filio.h \
sys/ioctl.h \
sys/ipc.h \
@@ -2207,6 +2208,7 @@ AC_CHECK_FUNCS(\
pipe2 \
@@ -2216,6 +2217,7 @@ AC_CHECK_FUNCS(\
poll \
port_create \
posix_fadvise \
+ ppoll \
prctl \
pread \
proc_pidinfo \
@@ -2271,6 +2273,16 @@ case $host_os in
@@ -2272,6 +2274,16 @@ case $host_os in
;;
esac
@@ -143,12 +143,12 @@ index 7a03cbc1cab..bfa64a8d68a 100644
if test "x$with_ldap" != "xno"
then
diff --git a/include/config.h.in b/include/config.h.in
index 4adb6325e14..6f1323311d9 100644
index 2b488894a49..1b3ab9f9580 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -687,6 +687,9 @@
/* Define to 1 if you have the <port.h> header file. */
#undef HAVE_PORT_H
@@ -516,6 +516,9 @@
/* Define to 1 if you have the `posix_fadvise' function. */
#undef HAVE_POSIX_FADVISE
+/* Define to 1 if you have the `ppoll' function. */
+#undef HAVE_PPOLL
@@ -156,7 +156,7 @@ index 4adb6325e14..6f1323311d9 100644
/* Define to 1 if you have the `prctl' function. */
#undef HAVE_PRCTL
@@ -804,6 +807,9 @@
@@ -600,6 +603,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 4adb6325e14..6f1323311d9 100644
/* Define if sigaddset is supported */
#undef HAVE_SIGADDSET
@@ -1004,6 +1010,9 @@
@@ -767,6 +773,9 @@
/* Define to 1 if you have the <sys/epoll.h> header file. */
#undef HAVE_SYS_EPOLL_H
@@ -177,5 +177,5 @@ index 4adb6325e14..6f1323311d9 100644
#undef HAVE_SYS_EVENT_H
--
2.28.0
2.32.0