df4a3c1833
Fix the following build failure with kernel < 5.0 raised since the
addition of the package in commit
e3975ec7d4:
catatonit.c:39:11: fatal error: linux/close_range.h: No such file or directory
39 | # include <linux/close_range.h>
| ^~~~~~~~~~~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/ed9a847905083175c7fcb2f2df28f9ac5b9c3313
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
From 1fefcbffe4ade02d625bf058a7c07aeaf9fa7a2f Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Tue, 1 Nov 2022 14:16:01 +0100
|
|
Subject: [PATCH] fix build with kernel < 5.9
|
|
|
|
linux/close_range.h is only available since kernel 5.9 and
|
|
https://github.com/torvalds/linux/commit/60997c3d45d9a67daf01c56d805ae4fec37e0bd8
|
|
resulting in the following build failure:
|
|
|
|
catatonit.c:39:11: fatal error: linux/close_range.h: No such file or directory
|
|
39 | # include <linux/close_range.h>
|
|
| ^~~~~~~~~~~~~~~~~~~~~
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/ed9a847905083175c7fcb2f2df28f9ac5b9c3313
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/openSUSE/catatonit/pull/24]
|
|
---
|
|
catatonit.c | 2 +-
|
|
configure.ac | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/catatonit.c b/catatonit.c
|
|
index a38263a..474c525 100644
|
|
--- a/catatonit.c
|
|
+++ b/catatonit.c
|
|
@@ -35,7 +35,7 @@
|
|
#include <limits.h>
|
|
#include <dirent.h>
|
|
|
|
-#ifdef HAVE_CLOSE_RANGE
|
|
+#ifdef HAVE_LINUX_CLOSE_RANGE_H
|
|
# include <linux/close_range.h>
|
|
#else
|
|
# include <sys/syscall.h>
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 94c5c84..a746ea1 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -22,7 +22,7 @@ LT_PREREQ([2.4.2])
|
|
LT_INIT([disable-shared])
|
|
|
|
AC_CHECK_HEADERS([errno.h fcntl.h signal.h stdarg.h stdio.h stdlib.h unistd.h])
|
|
-AC_CHECK_HEADERS([sys/prctl.h sys/signalfd.h sys/stat.h sys/types.h sys/wait.h])
|
|
+AC_CHECK_HEADERS([linux/close_range.h sys/prctl.h sys/signalfd.h sys/stat.h sys/types.h sys/wait.h])
|
|
|
|
AC_CHECK_FUNCS([close_range])
|
|
|
|
--
|
|
2.35.1
|
|
|