diff --git a/0001-enable-libc.patch b/0001-enable-libc.patch new file mode 100644 index 0000000000000000000000000000000000000000..ddee0882fdbb7dc2f8b6eeb6b5e6d928c27b5ce5 --- /dev/null +++ b/0001-enable-libc.patch @@ -0,0 +1,22 @@ +diff --git a/configure b/configure +index 28f3eb0..9f7cff4 100755 +--- a/configure ++++ b/configure +@@ -413,9 +413,15 @@ int main(void){ + #endif + } + EOF +-if compile_prog "" "" "nolibc support"; then +- liburing_nolibc="yes" +-fi ++# Temporarily disable nolibc because false positives exist and compilation may ++# fail later. The issue is that compile_prog does not use the CFLAGS modified ++# for nolibc, so it cannot detect when nolibc won't work (e.g. due to the gcc ++# stack protector requiring __stack_chk_fail_local from libc on i686). ++# ++# if compile_prog "" "" "nolibc support"; then ++# liburing_nolibc="yes" ++# fi ++liburing_nolibc="no" + print_config "nolibc support" "$liburing_nolibc"; + ############################################################################# diff --git a/liburing-2.3.tar.gz b/liburing-2.3.tar.gz deleted file mode 100644 index 3f1cef2eff47f8550205be9c9d7e33979290576a..0000000000000000000000000000000000000000 Binary files a/liburing-2.3.tar.gz and /dev/null differ diff --git a/liburing-2.4.tar.gz b/liburing-2.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4ef8d898017a5ed9fb1eed81ebb05b8a1854b3ec Binary files /dev/null and b/liburing-2.4.tar.gz differ diff --git a/liburing-Add-sw64-architecture.patch b/liburing-Add-sw64-architecture.patch deleted file mode 100644 index 74e3e545a9448cf8b262d496fdce8f187c90eccb..0000000000000000000000000000000000000000 --- a/liburing-Add-sw64-architecture.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 10500de05b6fdb5c39351d8ad704f4eb25e5074c Mon Sep 17 00:00:00 2001 -From: wzx -Date: Thu, 10 Nov 2022 14:47:45 +0800 -Subject: [PATCH] Add sw64 architecture - -Add sw64 architecture in src/include/liburing.h to support sw64 architecture. - -Conflict: liburing v2.3 move the support of architectures to src/include/liburing.h, -moving the counterpart to that place. - -Signed-off-by: wzx -Signed-off-by: lihaoxiang ---- - src/include/liburing.h | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/include/liburing.h b/src/include/liburing.h -index 12a703f..3de0b78 100644 ---- a/src/include/liburing.h -+++ b/src/include/liburing.h -@@ -57,7 +57,17 @@ - #ifndef __NR_io_uring_register - #define __NR_io_uring_register (__NR_Linux + 427) - #endif --#else /* !__alpha__ and !__mips__ */ -+#elif defined __sw_64__ -+#ifndef __NR_io_uring_setup -+#define __NR_io_uring_setup 272 -+#endif -+#ifndef __NR_io_uring_enter -+#define __NR_io_uring_enter 273 -+#endif -+#ifndef __NR_io_uring_register -+#define __NR_io_uring_register 274 -+#endif -+#else /* !__alpha__ and !__mips__ and !__sw_64__ */ - #ifndef __NR_io_uring_setup - #define __NR_io_uring_setup 425 - #endif --- -1.8.3.1 - diff --git a/liburing.spec b/liburing.spec index 0857e2a8de8ecfa57fd89b362990dc503e13c950..dce7dccaa32fc8873eda9a77048eb9281bf836a4 100644 --- a/liburing.spec +++ b/liburing.spec @@ -1,15 +1,15 @@ Name: liburing -Version: 2.3 +Version: 2.4 Release: 1 Summary: Linux-native io_uring I/O access library License: (GPLv2 with exceptions and LGPLv2+) or MIT Source0: https://brick.kernel.dk/snaps/%{name}-%{version}.tar.gz URL: https://git.kernel.dk/cgit/liburing/ BuildRequires: gcc -BuildRequires: g++ +BuildRequires: gcc-c++ BuildRequires: make -Patch1: liburing-Add-sw64-architecture.patch +Patch1: 0001-enable-libc.patch %description Provides native async IO for the Linux kernel, in a fast and efficient @@ -38,19 +38,25 @@ for the Linux-native io_uring. %files %attr(0755,root,root) %{_libdir}/liburing.so.* +%attr(0755,root,root) %{_libdir}/liburing-ffi.so.* %license COPYING %files devel %{_includedir}/liburing/ %{_includedir}/liburing.h %{_libdir}/liburing.so +%{_libdir}/liburing-ffi.so %exclude %{_libdir}/liburing.a +%exclude %{_libdir}/liburing-ffi.a %{_libdir}/pkgconfig/* %{_mandir}/man2/* %{_mandir}/man3/* %{_mandir}/man7/* %changelog +* Mon Mar 31 2025 yangchen - 2.4-1 +- Update to liburing 2.4 + * Mon Dec 12 2022 lihaoxiang - 2.3-1 - upgrade to liburing v2.3