1From c8f625e085b8249cc009e8b19c3a19100217eb35 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Thu, 25 Apr 2024 13:33:15 +0000
4Subject: [PATCH] Fix pidfd_open detection
5
6This check for pidfd_open uses AC_CHECK_FUNC which just runs the specified code, but
7src/pgrep.c checks HAVE_PIDFD_OPEN which will only be defined by AC_CHECK_FUNCS.
8
9Also pidfd_open is defined in sys/pidfd.h so that needs including.
10
11Upstream-Status: Submitted [https://gitlab.com/procps-ng/procps/-/merge_requests/229]
12Signed-off-by: Ross Burton <ross.burton@arm.com>
13---
14
15diff --git a/configure.ac b/configure.ac
16index fec27e3f..024731c7 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -170,7 +170,7 @@ AC_TRY_COMPILE([#include <errno.h>],
20 		AC_MSG_RESULT(yes),
21 		AC_MSG_RESULT(no))
22
23-AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [
24+AC_CHECK_FUNCS([pidfd_open], [enable_pidwait=yes], [
25   AC_MSG_CHECKING([for __NR_pidfd_open])
26   AC_COMPILE_IFELSE([AC_LANG_SOURCE([
27 #include <sys/syscall.h>
28diff --git a/src/pgrep.c b/src/pgrep.c
29index d8e57dff..c5211aec 100644
30--- a/src/pgrep.c
31+++ b/src/pgrep.c
32@@ -44,7 +44,9 @@
33
34 #ifdef ENABLE_PIDWAIT
35 #include <sys/epoll.h>
36-#ifndef HAVE_PIDFD_OPEN
37+#ifdef HAVE_PIDFD_OPEN
38+#include <sys/pidfd.h>
39+#else
40 #include <sys/syscall.h>
41 #endif /* !HAVE_PIDFD_OPEN */
42 #endif
43