summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2024-05-08 20:11:50 +0200
committerFlorian Schmaus <flow@gentoo.org>2024-05-08 22:48:25 +0200
commit2efcad9cf8a4b4fc4af6bcbbdbcca5cdf1e095ab (patch)
treeb0a10d7a1d8fbd9a0486f6eb8f4863a01a194ab6 /sys-libs
parentsys-process/below: add 0.8.1 (diff)
downloadgentoo-2efcad9cf8a4b4fc4af6bcbbdbcca5cdf1e095ab.tar.gz
gentoo-2efcad9cf8a4b4fc4af6bcbbdbcca5cdf1e095ab.tar.bz2
gentoo-2efcad9cf8a4b4fc4af6bcbbdbcca5cdf1e095ab.zip
sys-libs/liburing: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Florian Schmaus <flow@gentoo.org>
Diffstat (limited to 'sys-libs')
-rw-r--r--sys-libs/liburing/files/liburing-2.1-arm-syscall.patch54
-rw-r--r--sys-libs/liburing/files/liburing-2.1-gnu_source-musl-cpuset.patch42
2 files changed, 0 insertions, 96 deletions
diff --git a/sys-libs/liburing/files/liburing-2.1-arm-syscall.patch b/sys-libs/liburing/files/liburing-2.1-arm-syscall.patch
deleted file mode 100644
index a652b052148a..000000000000
--- a/sys-libs/liburing/files/liburing-2.1-arm-syscall.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://github.com/axboe/liburing/commit/cb350a8989adbd65db574325d9a86d5437d800da
-https://bugs.gentoo.org/816798
-
-From cb350a8989adbd65db574325d9a86d5437d800da Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Mon, 13 Sep 2021 23:56:08 +0200
-Subject: [PATCH] test: Use syscall wrappers instead of using syscall(2)
- directly
-
-Some of these syscalls have different entry points depending on the
-architecture. Use the wrappers to avoid having to reimplement them
-portably.
-
-Fixes build failures on Debian armel and armhf builds.
-
-Signed-off-by: Guillem Jover <guillem@hadrons.org>
---- a/test/sqpoll-cancel-hang.c
-+++ b/test/sqpoll-cancel-hang.c
-@@ -4,7 +4,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/mman.h>
--#include <sys/syscall.h>
- #include <sys/wait.h>
- #include <time.h>
- #include <unistd.h>
-@@ -29,8 +28,6 @@ static uint64_t current_time_ms(void)
-
- #define IORING_OFF_SQES 0x10000000ULL
-
--#define sys_io_uring_setup 425
--
- static void kill_and_wait(int pid, int* status)
- {
- kill(-pid, SIGKILL);
-@@ -53,7 +50,7 @@ a5)
- void* vma2 = (void*)a3;
- void** ring_ptr_out = (void**)a4;
- void** sqes_ptr_out = (void**)a5;
-- uint32_t fd_io_uring = syscall(sys_io_uring_setup, entries, setup_params);
-+ uint32_t fd_io_uring = __sys_io_uring_setup(entries, setup_params);
- uint32_t sq_ring_sz = setup_params->sq_off.array +
- setup_params->sq_entries * sizeof(uint32_t);
- uint32_t cq_ring_sz = setup_params->cq_off.cqes +
-@@ -135,7 +132,7 @@ void trigger_bug(void)
- }
- int main(void)
- {
-- syscall(__NR_mmap, 0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul);
-+ mmap((void *)0x20000000ul, 0x1000000ul, 7ul, 0x32ul, -1, 0ul);
- int pid = fork();
- if (pid < 0)
- exit(1);
-
diff --git a/sys-libs/liburing/files/liburing-2.1-gnu_source-musl-cpuset.patch b/sys-libs/liburing/files/liburing-2.1-gnu_source-musl-cpuset.patch
deleted file mode 100644
index b6486f8b140a..000000000000
--- a/sys-libs/liburing/files/liburing-2.1-gnu_source-musl-cpuset.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/axboe/liburing/commit/c34070e08199491fe9653617364f4aea9b9b22be
-
-From: Sam James <sam@gentoo.org>
-Date: Mon, 14 Mar 2022 14:18:55 +0000
-Subject: [PATCH] liburing.h: define GNU_SOURCE for cpu_set_t
-
-On musl, cpu_set_t is only exposed if GNU_SOURCE is defined. While in
-the liburing build system, this is set (43b7ec8d17888df0debccda27dd58f4d1b90245e),
-it can't be guaranteed that folks including the header externally will set
-that macro.
-
-Noticed while investigating a build failure for glusterfs on a musl
-system:
-```
-configure:17701: checking for liburing.h
-configure:17701: x86_64-gentoo-linux-musl-gcc -c -pipe -march=native -fno-diagnostics-color -O2 conftest.c >&5
-In file included from conftest.c:105:
-/usr/include/liburing.h:162:39: error: unknown type name 'cpu_set_t'
- 162 | const cpu_set_t *mask);
- | ^~~~~~~~~
-configure:17701: $? = 1
-```
-
-Just like _XOPEN_SOURCE, set if needed.
-
-Bug: https://bugs.gentoo.org/829293
-Bug: https://github.com/axboe/liburing/issues/422
-See: 43b7ec8d17888df0debccda27dd58f4d1b90245e
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/include/liburing.h
-+++ b/src/include/liburing.h
-@@ -6,6 +6,10 @@
- #define _XOPEN_SOURCE 500 /* Required for glibc to expose sigset_t */
- #endif
-
-+#ifndef _GNU_SOURCE
-+#define _GNU_SOURCE /* Required for musl to expose cpu_set_t */
-+#endif
-+
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/uio.h>