summaryrefslogtreecommitdiffstats
path: root/5579.patch
blob: 83c0a38196d1138e62d11cb93dc6257a48f4af7b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From fab5c53f92612e973072db691176672de237bae0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 21 Nov 2024 15:21:27 +0100
Subject: [PATCH] Fix #5577 error in HAVE_IOURING_FUTEX detection

---
 config.m4 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/config.m4 b/config.m4
index 3b12e5fce4..05e7b1f4de 100644
--- a/config.m4
+++ b/config.m4
@@ -960,16 +960,22 @@ EOF
 
         LINUX_VERSION=`uname -r | cut -d '-' -f 1`
         LINUX_MAJOR_VERSION=`echo $LINUX_VERSION | cut -d '.' -f 1`
-        LINUX_MINIO_VERSION=`echo $LINUX_VERSION | cut -d '.' -f 2`
+        LINUX_MINOR_VERSION=`echo $LINUX_VERSION | cut -d '.' -f 2`
 
         _PKG_CONFIG(URING_VERSION, [modversion], [liburing])
         IOURING_MAJOR_VERSION=`echo $pkg_cv_URING_VERSION | cut -d '.' -f 1`
         IOURING_MINOR_VERSION=`echo $pkg_cv_URING_VERSION | cut -d '.' -f 2`
 
-        if test $IOURING_MAJOR_VERSION > 2 || (test $IOURING_MAJOR_VERSION = 2 && test $IOURING_MINOR_VERSION >= 6); then
-            if test $LINUX_MAJOR_VERSION > 6 || (test $LINUX_MAJOR_VERSION = 6 && test $LINUX_MAJOR_VERSION >= 7); then
+        AC_MSG_CHECKING([checking for io_uring futex feature])
+        if test $IOURING_MAJOR_VERSION -gt 2 || (test $IOURING_MAJOR_VERSION -eq 2 && test $IOURING_MINOR_VERSION -ge 6); then
+            if test $LINUX_MAJOR_VERSION -gt 6 || (test $LINUX_MAJOR_VERSION -eq 6 && test $LINUX_MINOR_VERSION -ge 7); then
+                AC_MSG_RESULT(yes)
                 AC_DEFINE(HAVE_IOURING_FUTEX, 1, [have io_uring futex feature])
+            else
+                AC_MSG_RESULT([no, Linux $LINUX_VERSION is too old])
             fi
+        else
+            AC_MSG_RESULT([no, liburing $IOURING_MAJOR_VERSION.$IOURING_MINOR_VERSION is too old])
         fi
     fi