1 |
commit: a0ccb905d1e5020426b3ecd4af586971f492e4e8 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Sun Jan 1 13:43:40 2023 +0000 |
4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 1 18:16:16 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ccb905 |
7 |
|
8 |
sys-fs/bees: remove unused patch(es) |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/28916 |
12 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
13 |
|
14 |
...K-musl-does-not-define-pthread_getname_np.patch | 49 ---------------------- |
15 |
1 file changed, 49 deletions(-) |
16 |
|
17 |
diff --git a/sys-fs/bees/files/0001-HACK-musl-does-not-define-pthread_getname_np.patch b/sys-fs/bees/files/0001-HACK-musl-does-not-define-pthread_getname_np.patch |
18 |
deleted file mode 100644 |
19 |
index 5f542956d88b..000000000000 |
20 |
--- a/sys-fs/bees/files/0001-HACK-musl-does-not-define-pthread_getname_np.patch |
21 |
+++ /dev/null |
22 |
@@ -1,49 +0,0 @@ |
23 |
-From ba43aef5e264abd4b24baa1ca9f042e30e565155 Mon Sep 17 00:00:00 2001 |
24 |
-From: Kai Krakow <kai@××××××××.de> |
25 |
-Date: Thu, 16 Apr 2020 21:21:57 +0200 |
26 |
-Subject: [PATCH] HACK: musl does not define pthread_getname_np() |
27 |
- |
28 |
-The glibc alternative musl does not define this setter function. This |
29 |
-fix is probably wrong because it resets the thread names used for |
30 |
-logging internally to empty strings. |
31 |
- |
32 |
-Link: https://www.openwall.com/lists/musl/2019/07/17/3 |
33 |
---- |
34 |
- lib/task.cc | 2 ++ |
35 |
- src/bees.cc | 2 ++ |
36 |
- 2 files changed, 4 insertions(+) |
37 |
- |
38 |
-diff --git a/lib/task.cc b/lib/task.cc |
39 |
-index 4bdaeec..5b03335 100644 |
40 |
---- a/lib/task.cc |
41 |
-+++ b/lib/task.cc |
42 |
-@@ -104,7 +104,9 @@ namespace crucible { |
43 |
- |
44 |
- char buf[24]; |
45 |
- memset(buf, '\0', sizeof(buf)); |
46 |
-+#ifdef _GNU_SOURCE |
47 |
- DIE_IF_MINUS_ERRNO(pthread_getname_np(pthread_self(), buf, sizeof(buf))); |
48 |
-+#endif |
49 |
- Cleanup pthread_name_cleaner([&]() { |
50 |
- pthread_setname_np(pthread_self(), buf); |
51 |
- }); |
52 |
-diff --git a/src/bees.cc b/src/bees.cc |
53 |
-index aa55af0..c1cc8cb 100644 |
54 |
---- a/src/bees.cc |
55 |
-+++ b/src/bees.cc |
56 |
-@@ -160,10 +160,12 @@ BeesNote::get_name() |
57 |
- // OK try the pthread name next. |
58 |
- char buf[24]; |
59 |
- memset(buf, '\0', sizeof(buf)); |
60 |
-+#ifdef _GNU_SOURCE |
61 |
- int err = pthread_getname_np(pthread_self(), buf, sizeof(buf)); |
62 |
- if (err) { |
63 |
- return string("pthread_getname_np: ") + strerror(err); |
64 |
- } |
65 |
-+#endif |
66 |
- buf[sizeof(buf) - 1] = '\0'; |
67 |
- |
68 |
- // thread_getname_np returns process name |
69 |
--- |
70 |
-2.24.1 |
71 |
- |