2 files changed, 49 insertions, 4 deletions

diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
new file mode 100644
index 0000000000..f744812a3f
--- /dev/null
+++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
@@ -0,0 +1,39 @@
+From c55874bc28f66d606527b940d4bd0f266bbaaa2c Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 17 Feb 2025 11:51:19 -0800
+Subject: [PATCH] test: Including missing string.h for memcpy
+
+Fixes
+accept-test.c:39:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+
+Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1351]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ test/232c93d07b74.c | 1 +
+ test/accept-test.c  | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/test/232c93d07b74.c b/test/232c93d07b74.c
+index d3053b9..d5677d3 100644
+--- a/test/232c93d07b74.c
++++ b/test/232c93d07b74.c
+@@ -10,6 +10,7 @@
+ #include <stdlib.h>
+ #include <stdint.h>
+ #include <assert.h>
++#include <string.h>
+ 
+ #include <pthread.h>
+ #include <errno.h>
+diff --git a/test/accept-test.c b/test/accept-test.c
+index 99f6080..142b2de 100644
+--- a/test/accept-test.c
++++ b/test/accept-test.c
+@@ -7,6 +7,7 @@
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <assert.h>
++#include <string.h>
+ #include "liburing.h"
+ #include "helpers.h"
+ 
diff --git a/meta-oe/recipes-support/liburing/liburing_2.5.bb b/meta-oe/recipes-support/liburing/liburing_2.9.bb
index 440259ffbd..a645a8e4c4 100644
--- a/meta-oe/recipes-support/liburing/liburing_2.5.bb
+++ b/meta-oe/recipes-support/liburing/liburing_2.9.bb
@@ -9,18 +9,24 @@ SECTION = "libs"
 LICENSE = "LGPL-2.1-only | MIT"
 LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af"
 
-SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https"
-SRCREV = "f4e42a515cd78c8c9cac2be14222834be5f8df2b"
+SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \
+           file://0001-test-Including-missing-string.h-for-memcpy.patch"
+SRCREV = "08468cc3830185c75f9e7edefd88aa01e5c2f8ab"
 
-S = "${WORKDIR}/git"
 
 DEPENDS:append:libc-musl = " libucontext"
 XCFLAGS = "-pthread"
 XCFLAGS:append:libc-musl = " -lucontext"
 
+USELIBC = ""
+# clang-18+ on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro
+# this does not happen for gcc or older clang, so link with libc since we need memset API
+# -fno-builtin-memset does not help
+USELIBC:riscv64:toolchain-clang = "--use-libc"
+USELIBC:riscv32 = "--use-libc"
 EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'"
 do_configure() {
-    ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir}
+    ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC}
 }
 do_install () {
     oe_runmake install DESTDIR=${D}