summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc1
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch49
2 files changed, 50 insertions, 0 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 53a24d14bc..6e07f1ffa9 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -15,6 +15,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \
15 file://fix-arm-atomic.patch \ 15 file://fix-arm-atomic.patch \
16 file://0001-Fix-library-LZ4-lookup.patch \ 16 file://0001-Fix-library-LZ4-lookup.patch \
17 file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \ 17 file://0001-innobase-Define-__NR_futex-if-it-does-not-exist.patch \
18 file://0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch \
18 file://ssize_t.patch \ 19 file://ssize_t.patch \
19 file://sys_futex.patch \ 20 file://sys_futex.patch \
20 file://cross-compiling.patch \ 21 file://cross-compiling.patch \
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch
new file mode 100644
index 0000000000..ee0d1b37ae
--- /dev/null
+++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_libaio-Check-if-syscall-exists-before-using-it.patch
@@ -0,0 +1,49 @@
1From a30e52fdb6507dd39b081b1218d95eb8582b81fb Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?=
3 <zboszor@gmail.com>
4Date: Mon, 13 Oct 2025 08:57:05 +0200
5Subject: [PATCH] aio_libaio: Check if syscall exists before using it
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10Return -ENOSYS if not implememented, fixes build on arches like RISCV32
11Fixes
12tpool/aio_libaio.cc:61:20:
13error: use of undeclared identifier '
14 ↪ __NR_io_getevents'; did you mean 'io_getevents'?
15 | 61 | int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx),
16 | | ^~~~~~~~~~~~~~~~~
17
18Upstream-Status: Pending
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
21---
22 tpool/aio_libaio.cc | 4 ++++
23 1 file changed, 4 insertions(+)
24
25diff --git a/tpool/aio_libaio.cc b/tpool/aio_libaio.cc
26index 2ce69384cde..60f558afa87 100644
27--- a/tpool/aio_libaio.cc
28+++ b/tpool/aio_libaio.cc
29@@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/
30 static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
31 noexcept
32 {
33+#ifdef __NR_io_getevents
34 int saved_errno= errno;
35 int ret= syscall(__NR_io_getevents, reinterpret_cast<long>(ctx),
36 min_nr, nr, ev, 0);
37@@ -67,6 +68,9 @@ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev)
38 errno= saved_errno;
39 }
40 return ret;
41+#else
42+ return -ENOSYS;
43+#endif
44 }
45
46
47--
482.51.0
49