diff options
| author |   Kai Krakow <kai@kaishome.de> | 2020-04-16 21:34:11 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2020-04-17 18:10:32 +0300 |
| commit | ca424c044ad8c11f2b0838508e1fa1d3276fdb72 (patch) | |
| tree | 0eff4a5410e27fc0f36f885674b7664b15b9319f /sys-fs/bees/files | |
| parent | games-fps/yamagi-quake2: Remove old (diff) | |
| download | gentoo-ca424c044ad8c11f2b0838508e1fa1d3276fdb72.tar.gz gentoo-ca424c044ad8c11f2b0838508e1fa1d3276fdb72.tar.bz2 gentoo-ca424c044ad8c11f2b0838508e1fa1d3276fdb72.zip | |
sys-fs/bees: Add musl hack to 0.6.1-r2
Package-Manager: Portage-2.3.89, Repoman-2.3.20
See-also: https://github.com/Zygo/bees/pull/143
Closes: https://bugs.gentoo.org/713960
Signed-off-by: Kai Krakow <kai@kaishome.de>
Closes: https://github.com/gentoo/gentoo/pull/15374
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sys-fs/bees/files')
| -rw-r--r-- | sys-fs/bees/files/0001-HACK-musl-does-not-define-pthread_getname_np.patch | 49 |
1 files changed, 49 insertions, 0 deletions
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 new file mode 100644 index 000000000000..5f542956d88b --- /dev/null +++ b/sys-fs/bees/files/0001-HACK-musl-does-not-define-pthread_getname_np.patch @@ -0,0 +1,49 @@ +From ba43aef5e264abd4b24baa1ca9f042e30e565155 Mon Sep 17 00:00:00 2001 +From: Kai Krakow <kai@kaishome.de> +Date: Thu, 16 Apr 2020 21:21:57 +0200 +Subject: [PATCH] HACK: musl does not define pthread_getname_np() + +The glibc alternative musl does not define this setter function. This +fix is probably wrong because it resets the thread names used for +logging internally to empty strings. + +Link: https://www.openwall.com/lists/musl/2019/07/17/3 +--- + lib/task.cc | 2 ++ + src/bees.cc | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/lib/task.cc b/lib/task.cc +index 4bdaeec..5b03335 100644 +--- a/lib/task.cc ++++ b/lib/task.cc +@@ -104,7 +104,9 @@ namespace crucible { + + char buf[24]; + memset(buf, '\0', sizeof(buf)); ++#ifdef _GNU_SOURCE + DIE_IF_MINUS_ERRNO(pthread_getname_np(pthread_self(), buf, sizeof(buf))); ++#endif + Cleanup pthread_name_cleaner([&]() { + pthread_setname_np(pthread_self(), buf); + }); +diff --git a/src/bees.cc b/src/bees.cc +index aa55af0..c1cc8cb 100644 +--- a/src/bees.cc ++++ b/src/bees.cc +@@ -160,10 +160,12 @@ BeesNote::get_name() + // OK try the pthread name next. + char buf[24]; + memset(buf, '\0', sizeof(buf)); ++#ifdef _GNU_SOURCE + int err = pthread_getname_np(pthread_self(), buf, sizeof(buf)); + if (err) { + return string("pthread_getname_np: ") + strerror(err); + } ++#endif + buf[sizeof(buf) - 1] = '\0'; + + // thread_getname_np returns process name +-- +2.24.1 + |