From a8c72984ae2e4d3a80cf4f562a79f2f08ff5fadc Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Sep 2024 16:10:07 -0700 Subject: liburing: Upgrade to 2.7 and fix build on riscv32 Fix build regression with musl Signed-off-by: Khem Raj --- ...e-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch | 43 ++++++++++++++++++++++ .../0001-test-Drop-including-error.h-header.patch | 27 ++++++++++++++ ...reg.c-Include-poll.h-instead-of-sys-poll..patch | 32 ++++++++++++++++ meta-oe/recipes-support/liburing/liburing_2.6.bb | 34 ----------------- meta-oe/recipes-support/liburing/liburing_2.7.bb | 38 +++++++++++++++++++ 5 files changed, 140 insertions(+), 34 deletions(-) create mode 100644 meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch create mode 100644 meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch create mode 100644 meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch delete mode 100644 meta-oe/recipes-support/liburing/liburing_2.6.bb create mode 100644 meta-oe/recipes-support/liburing/liburing_2.7.bb diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch new file mode 100644 index 0000000000..90f028b856 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch @@ -0,0 +1,43 @@ +From 7ea4e55a91e6d5564c6de762c2d1afc78ff9cfd3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 16 Sep 2024 22:58:38 +0000 +Subject: [PATCH] test: Compile nolibc.c only when CONFIG_NOLIBC is set + +building nolibc.c fails for non nolibc targets + +Fixes +In file included from nolibc.c:33: +./../src/lib.h:20:2: error: "This arch doesn't support building liburing without libc" + 20 | #error "This arch doesn't support building liburing without libc" + | ^ +1 error generated. + +Upstream-Status: Backport [https://github.com/axboe/liburing/commit/a182f62c01f981cd9dd508ec952fbc975b263e3d] +Signed-off-by: Khem Raj +--- + test/Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test/Makefile b/test/Makefile +index 0538a75..0dfecb8 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -126,7 +126,6 @@ test_srcs := \ + msg-ring-overflow.c \ + multicqes_drain.c \ + no-mmap-inval.c \ +- nolibc.c \ + nop-all-sizes.c \ + nop.c \ + ooo-file-unreg.c \ +@@ -221,6 +220,10 @@ test_srcs := \ + all_targets := + include ../Makefile.quiet + ++ifeq ($(CONFIG_NOLIBC),y) ++ test_srcs += nolibc.c ++endif ++ + ifdef CONFIG_HAVE_STATX + test_srcs += statx.c + else ifdef CONFIG_HAVE_GLIBC_STATX diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch new file mode 100644 index 0000000000..62ca78a1ed --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch @@ -0,0 +1,27 @@ +From 684bcb2a8795fd399d6c164e51459a2785057b1c Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 Sep 2024 09:56:42 -0700 +Subject: [PATCH 1/2] test: Drop including error.h header + +There is no error APIs being used in this test, therefore +drop including it, this also makes it portable to musl +systems which do not have error.h + +Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233] +Signed-off-by: Khem Raj +--- + test/init-mem.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/test/init-mem.c b/test/init-mem.c +index 6f9a02a..f512190 100644 +--- a/test/init-mem.c ++++ b/test/init-mem.c +@@ -13,7 +13,6 @@ + #include + #include + #include +-#include + + #include "liburing.h" + #include "helpers.h" diff --git a/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch b/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch new file mode 100644 index 0000000000..8a1d542502 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch @@ -0,0 +1,32 @@ +From d06433ff1a1905436cfcde80e22ee51bd9591536 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 Sep 2024 09:59:31 -0700 +Subject: [PATCH 2/2] ooo-file-unreg.c: Include poll.h instead of sys/poll.h + +This fixes a warning e.g. + +In file included from ooo-file-unreg.c:12: +/mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux-musl/liburing/2.7/recipe-sysroot/usr/include/sys/poll.h:1:2: warning: redirecting incorrect #include to [-W#warnings] + 1 | #warning redirecting incorrect #include to + | ^ +1 warning generated. + +Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233] +Signed-off-by: Khem Raj +--- + test/ooo-file-unreg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/ooo-file-unreg.c b/test/ooo-file-unreg.c +index d76e0fb..dd6ea55 100644 +--- a/test/ooo-file-unreg.c ++++ b/test/ooo-file-unreg.c +@@ -9,7 +9,7 @@ + #include + #include + #include +-#include ++#include + + #include "liburing.h" + #include "helpers.h" diff --git a/meta-oe/recipes-support/liburing/liburing_2.6.bb b/meta-oe/recipes-support/liburing/liburing_2.6.bb deleted file mode 100644 index fc3fe1cac1..0000000000 --- a/meta-oe/recipes-support/liburing/liburing_2.6.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "This is the io_uring library, liburing." -DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ -instances, and also a simplified interface for applications that don't need \ -(or want) to deal with the full kernel side implementation." -HOMEPAGE = "https://github.com/axboe/liburing" -BUGTRACKER = "https://github.com/axboe/liburing/issues" -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 = "f7dcc1ea60819475dffd3a45059e16f04381bee7" - -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" -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} ${USELIBC} -} -do_install () { - oe_runmake install DESTDIR=${D} -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-support/liburing/liburing_2.7.bb b/meta-oe/recipes-support/liburing/liburing_2.7.bb new file mode 100644 index 0000000000..b10fe40ca0 --- /dev/null +++ b/meta-oe/recipes-support/liburing/liburing_2.7.bb @@ -0,0 +1,38 @@ +SUMMARY = "This is the io_uring library, liburing." +DESCRIPTION = "liburing provides helpers to setup and teardown io_uring \ +instances, and also a simplified interface for applications that don't need \ +(or want) to deal with the full kernel side implementation." +HOMEPAGE = "https://github.com/axboe/liburing" +BUGTRACKER = "https://github.com/axboe/liburing/issues" +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 \ + file://0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch \ + file://0001-test-Drop-including-error.h-header.patch \ + file://0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch" +SRCREV = "5227d48b28ad8671e61d444b72678da584d2e6c3" + +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} ${USELIBC} +} +do_install () { + oe_runmake install DESTDIR=${D} +} + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf