gentoo auto-resync : 09:05:2024 - 00:01:03

3 files changed, 0 insertions, 98 deletions

diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest
index 7263353aef5f..5d1aefeb923e 100644
--- a/sys-libs/liburing/Manifest
+++ b/sys-libs/liburing/Manifest
@@ -1,5 +1,3 @@
-AUX liburing-2.1-arm-syscall.patch 1752 BLAKE2B f2f27e9ff6f86b75808d99a0e89e2c8609f481ba3ff1f908b1f2ec670a5ab5518ea990ff4bc24506f5ce6f6d8e1083ac7e3b0aaee9d72a8fb5bc3d4577617309 SHA512 04e1c92d6b399f046c500ff3a7d78990682e60df3994431977f7a01bea0fba0fb1dea6e66340bfd79869fbc2114f4e9a9eb391ed26d81a3041accf78141fd158
-AUX liburing-2.1-gnu_source-musl-cpuset.patch 1483 BLAKE2B 4df57662e28240455795415c4de4b3047afdfcd0818d829f79c0489539d6646fa84de8ef94d15488e8d66169598bbfdd4dbbd21c90638eb5e372ecfdbb2dfe8c SHA512 a779f9077c2529c8e294ff6c22823c149d79eb84f20889583422987eec42c3e549d61041e07456a9b085284fdc5f44e8816efa837e4e8865deb6874f29f463f0
 AUX liburing-2.3-liburing.map-Export-io_uring_-enable_rings-register_.patch 1233 BLAKE2B 86113d0201afc1860d240f585a392dd45ea8a1b45adbae96c2a87d18f8540bae96a6a5efc6e8a971aa1535034a859a99c75ea6e43c0744967707aebcc93e08c0 SHA512 7110eae38e18e710522211a9ab8b5a0879107dc236553b139d460a0068e44def9e28357c615665920dd86e0b70d552daeb09b677ca460adc3eb352fffe61be73
 AUX liburing-2.3-remove-error-from-error_h-for-portability.patch 4160 BLAKE2B 0262d1eb46b9df94cd98df5fab24b88dd15e5e4c2d6095b3d85e308ead3f171d7960cf5046823d44ec62529e7b9c0e83260f87a41ec3a66316f29782c31ff28d SHA512 35194720209c36dfb42413441b598543f5b9691c36614a4bb7fdbf6e151fa31bced5ecf389fd50290d69746b299ae9978d102a47f0c303ca33a07a91e7bddf1b
 AUX liburing-2.5-lld-17.patch 944 BLAKE2B 4369d02ca7599b28e33aee7639600546f2b1e37bc806b8d3810102915b75d81c36ee089eacd9c899299e6f71c82076688e7e66ff9014b646a565b2567a947e37 SHA512 3c7fa358837e81a791576ee1e392f947f9153cb62de3b53e5b063f5c745b477ba6754dcf7785903372e91fb8d475a46b43cc787edb66996d79c0d7fd97186687
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>