commit: 720380608a463dfa20ccc36dfb0407456a7d8a48
Author: Thomas Deutschmann gentoo org>
AuthorDate: Wed Mar 25 13:45:38 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Mar 25 13:45:38 2020 +
URL:https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=72038060
util-linux: fix compile error caused by undefined SYS_pidfd_send_signal
Bug: https://bugs.gentoo.org/714100
Signed-off-by: Thomas Deutschmann gentoo.org>
...linux-2.35.1-001-include_sys_types-header.patch | 58 ++
...il-linux-2.35.1-002-cleanup-pidfd-include.patch | 36 ++
2 files changed, 94 insertions(+)
diff --git
a/patches/util-linux/2.35.1/util-linux-2.35.1-001-include_sys_types-header.patch
b/patches/util-linux/2.35.1/util-linux-2.35.1-001-include_sys_types-header.patch
new file mode 100644
index 000..8c646ee
--- /dev/null
+++
b/patches/util-linux/2.35.1/util-linux-2.35.1-001-include_sys_types-header.patch
@@ -0,0 +1,58 @@
+From 3cfde0370d3a8949df0c5bcf447cec6692910ed2 Mon Sep 17 00:00:00 2001
+From: Sami Kerola
+Date: Sat, 15 Feb 2020 21:12:50 +
+Subject: [PATCH] kill: include sys/types.h before checking
+ SYS_pidfd_send_signal
+
+Including sys/types.h must happen before SYS_pidfd_send_signal is checked,
+because that header defines variable in normal conditions. When sys/types.h
+does not have SYS_pidfd_send_signal then fallback is defined in config.h
+that is included by default, and has therefore worked fine before and after
+this change.
+
+Signed-off-by: Sami Kerola
+---
+ include/pidfd-utils.h | 18 ++
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
+index 593346576..0baedd2c9 100644
+--- a/include/pidfd-utils.h
b/include/pidfd-utils.h
+@@ -1,26 +1,28 @@
+ #ifndef UTIL_LINUX_PIDFD_UTILS
+ #define UTIL_LINUX_PIDFD_UTILS
+
+-#if defined(__linux__) && defined(SYS_pidfd_send_signal)
+-# include
++#if defined(__linux__)
+ # include
++# if defined(SYS_pidfd_send_signal)
++# include
+
+-# ifndef HAVE_PIDFD_OPEN
++# ifndef HAVE_PIDFD_OPEN
+ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
+ unsigned int flags)
+ {
+ return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags);
+ }
+-# endif
++# endif
+
+-# ifndef HAVE_PIDFD_SEND_SIGNAL
++# ifndef HAVE_PIDFD_SEND_SIGNAL
+ static inline int pidfd_open(pid_t pid, unsigned int flags)
+ {
+ return syscall(SYS_pidfd_open, pid, flags);
+ }
+-# endif
++# endif
+
+-# define UL_HAVE_PIDFD 1
++# define UL_HAVE_PIDFD 1
+
+-#endif /* __linux__ && SYS_pidfd_send_signal */
++# endif /* SYS_pidfd_send_signal */
++#endif /* __linux__ */
+ #endif /* UTIL_LINUX_PIDFD_UTILS */
diff --git
a/patches/util-linux/2.35.1/util-linux-2.35.1-002-cleanup-pidfd-include.patch
b/patches/util-linux/2.35.1/util-linux-2.35.1-002-cleanup-pidfd-include.patch
new file mode 100644
index 000..85e4d70
--- /dev/null
+++
b/patches/util-linux/2.35.1/util-linux-2.35.1-002-cleanup-pidfd-include.patch
@@ -0,0 +1,36 @@
+From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001
+From: Karel Zak
+Date: Tue, 10 Mar 2020 11:43:16 +0100
+Subject: [PATCH] include: cleanup pidfd inckudes
+
+Signed-off-by: Karel Zak
+---
+ include/pidfd-utils.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
+index 0baedd2c9..4a6c3a604 100644
+--- a/include/pidfd-utils.h
b/include/pidfd-utils.h
+@@ -3,10 +3,10 @@
+
+ #if defined(__linux__)
+ # include
+-# if defined(SYS_pidfd_send_signal)
++# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open)
+ # include
+
+-# ifndef HAVE_PIDFD_OPEN
++# ifndef HAVE_PIDFD_SEND_SIGNAL
+ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
+ unsigned int flags)
+ {
+@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig,
siginfo_t *info,
+ }
+ # endif
+
+-# ifndef HAVE_PIDFD_SEND_SIGNAL
++# ifndef HAVE_PIDFD_OPEN
+ static inline int pidfd_open(pid_t pid, unsigned int flags)
+ {
+ return syscall(SYS_pidfd_open, pid, flags);
