gentoo resync : 08.01.2021

6 files changed, 44 insertions, 283 deletions

diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 70608ea5b27c..b53b37f27d3a 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,8 +1,5 @@
 AUX 0001-HACK-musl-does-not-define-pthread_getname_np.patch 1406 BLAKE2B 92d82eb147a90ca65acfe9b2ff16dd6f514fa1f2a5950b1f6fcdff68963e0f4be4a8b9b2b695a912eb1ac2ffcc0b171749d4c8b38f733451aa48646b2a8653ce SHA512 93bd338ec59fa0601178e3737a4eaeb8af7df83c16b409544ec55bdf7865786785cf6a9a160dd29cb4b8eadc2c6f311f6cd3bbe6e9310ad2356fd69ff5ba35bc
-AUX 6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch 1281 BLAKE2B 07eb31ec5abbc62edd8edec111a3f3174f62c587ceeb80736f6cd7992357e41af4976ef528a8668064ddad7e0ccea5ab281f41e8e062bd2606e6cc7c376a90c4 SHA512 ebf16d968acd8a22135c08f4c6e68bebf30651bc93c1e27453b1d7ca35d09d755dd36064b7e42204e6d8fe9b06d6c316cc8c7362df0ff548cff181830e7375ee
-AUX 6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch 3250 BLAKE2B 3f6a81bbf00aa528b238b1c54458c369ebcfd890cf5080e640b0e201273cc01f72380fd57b3f63ff02c9ace0c6a7d8ac9c5b684182b5d8957be756107aab24a5 SHA512 827871dfe5d7ddd2dd6afad96b23f25ba4f722d7f73575554d9968f95e22990b36d1d34384406beb72a61050938a1e8910fbac5ea8d68fb41dfdc099d1ed183e
-AUX 6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch 3102 BLAKE2B 20319e2791f68201bc7b13471b4192b2124cfd9d16f72ced72e95cd99619d890834d5373b45f620be2375a1a8d3db780d83b95fa855488643035ed244ee16c6c SHA512 1042b4042718061be5bbfe5201000c5098bf63a1eee157ae093c4ff99d72a9a7d74fafa865a1d08eb5e8243116ac1b36e2e1dbb224548c1517def1955ba3fb18
-DIST bees-0.6.1.tar.gz 124411 BLAKE2B fd6c875334cb610da94a4633351b7edc5a4ecf4ff467bb93c8559a1698fd29667d43955e0031498401ceeb3d8db13b5aeb80d2f16cd61e4d5a6607e432082c79 SHA512 cd44d21959d3ab4dda255f0a4a57bd3aeecfb9fee6ea26d68a1b5f84d407f75bd0b442ecf4fefc5ac856dcd9af035f44ceeff77a8926b164f97a15350efcee33
-EBUILD bees-0.6.1-r2.ebuild 3530 BLAKE2B bfb723fb4df7bffc3463bb8c102027d33922f6bcddb3d663aec57844846e15d0d91a94076f60390004a93598ac15e5c3a97e5430f2a8a1bac8b13f6500404892 SHA512 01ddc099d86adf73eea46fb447e807ed6b571c6f7bd1f0a3f4b6acaa9d74ec555b89b8ae27ae3f0a9b139b3e4c3edb77bd009b196c2febe30c87a38bb373d221
-EBUILD bees-9999.ebuild 3148 BLAKE2B 05dcb515e076c7572be647d97ed05891a989c290248e119dea54b0f979a09ce3fdacde0b301a6c19c3d8e82d460c438b47ed19189ef816a709cc4f09a7096091 SHA512 e92b472c4f6cc6666638436f1afa8036a2e08c1a7f07ae9870f0a2c7c1312341dce9c8a23e7e548f21b4c93e120da086b940f50987c4e6f4dbd1d83a54963d0f
+DIST bees-0.6.4.tar.gz 126064 BLAKE2B 562f0cfd63d15978a26f859548eb36cea0bf1be8e363c7ee5d2294e3c6407b4a93d865ffe2d15fabaeb2b3e136ad2d48cab3210c00e5fe39432985186ad62c55 SHA512 ce0eb66ac0770838e13ba6007fd765c02aea3f5eefc09e2834118d420e71693c37b8aa8511cfc9577ca09ab82d37787a1854edbed090c059759b29c70d834672
+EBUILD bees-0.6.4.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da
+EBUILD bees-9999.ebuild 3097 BLAKE2B ccab0344ebed9ebd7f764ce15c6a1b0c553055e49b1365cf5a612fc12234cc14e4537267fc7502c6c6284e1a4c0e2bd1a3dfa735918922ce181bab709a7cb423 SHA512 2d3852a1a15739dc357987a659ec2cee1f4c2991aa7a2a8a0735484b4ef67cdebc7c972261ec71e78a19191e5a7dd6ed7f5149f61453b5a5b27bebe6769f73da
 MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20
diff --git a/sys-fs/bees/bees-0.6.1-r2.ebuild b/sys-fs/bees/bees-0.6.4.ebuild
index 70bf39d08a69..6c38f7b9c91e 100644
--- a/sys-fs/bees/bees-0.6.1-r2.ebuild
+++ b/sys-fs/bees/bees-0.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,9 @@ inherit linux-info systemd
 DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
 HOMEPAGE="https://github.com/Zygo/bees"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
 else
 	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64"
@@ -29,21 +29,11 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
-PATCHES=(
-	"${FILESDIR}/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch"
-	"${FILESDIR}/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch"
-	"${FILESDIR}/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch"
-	"${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch"
-)
+PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" )
 
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 4 3; then
-			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
-			ewarn "properly operate, so it won't work. It's recommended to run at least"
-			ewarn "kernel version 4.11 for best performance and reliability."
-			ewarn
-		elif kernel_is -lt 4 11; then
+		if kernel_is -lt 4 11; then
 			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
 			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
 			ewarn "running, it's recommended to run at least kernel 4.11."
@@ -55,7 +45,14 @@ pkg_pretend() {
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
 		fi
-
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
 		if kernel_is -lt 5 3 4; then
 			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
 			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
@@ -66,20 +63,16 @@ pkg_pretend() {
 			ewarn
 		fi
 
-		if kernel_is -lt 5 0 4; then
-			ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
-			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
-			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
-			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
-			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
-			ewarn
-		fi
-
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
 	fi
 }
 
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
 src_configure() {
 	cat >localconf <<-EOF || die
 		LIBEXEC_PREFIX=/usr/libexec
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 0bfb2654d893..6c38f7b9c91e 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit linux-info
+inherit linux-info systemd
 
 DESCRIPTION="Best-Effort Extent-Same, a btrfs dedup agent"
 HOMEPAGE="https://github.com/Zygo/bees"
 
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Zygo/bees.git"
 else
 	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="GPL-3"
@@ -29,14 +29,11 @@ RDEPEND="${DEPEND}"
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
+PATCHES=( "${FILESDIR}/0001-HACK-musl-does-not-define-pthread_getname_np.patch" )
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if kernel_is -lt 4 4 3; then
-			ewarn "Kernel versions below 4.4.3 lack critical features needed for bees to"
-			ewarn "properly operate, so it won't work. It's recommended to run at least"
-			ewarn "kernel version 4.11 for best performance and reliability."
-			ewarn
-		elif kernel_is -lt 4 11; then
+		if kernel_is -lt 4 11; then
 			ewarn "With kernel versions below 4.11, bees may severely degrade system performance"
 			ewarn "and responsiveness. Especially, the kernel may deadlock while bees is"
 			ewarn "running, it's recommended to run at least kernel 4.11."
@@ -48,7 +45,14 @@ pkg_pretend() {
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
 		fi
-
+		if kernel_is -lt 5 1 0; then
+			ewarn "IMPORTANT: With kernel versions below 5.1.0, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
 		if kernel_is -lt 5 3 4; then
 			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
 			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
@@ -59,25 +63,22 @@ pkg_pretend() {
 			ewarn
 		fi
 
-		if kernel_is -lt 5 0 4; then
-			ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
-			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
-			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
-			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
-			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
-			ewarn
-		fi
-
 		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
 	fi
 }
 
+src_prepare() {
+	default
+	sed -i 's/ -Werror//' makeflags || die
+}
+
 src_configure() {
 	cat >localconf <<-EOF || die
 		LIBEXEC_PREFIX=/usr/libexec
 		PREFIX=/usr
-		LIBDIR=$(get_libdir)
+		LIBDIR="$(get_libdir)"
+		SYSTEMD_SYSTEM_UNIT_DIR="$(systemd_get_systemunitdir)"
 		DEFAULT_MAKE_TARGET=all
 	EOF
 	if [[ ${PV} != "9999" ]] ; then
diff --git a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch b/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
deleted file mode 100644
index 60ab748eb2b6..000000000000
--- a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 566df54a3f7458559b75455a95b1991b515ba6bf Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <zblaxell@thirteen.furryterror.org>
-Date: Wed, 12 Jun 2019 21:27:50 -0400
-Subject: [PATCH 1/2] lib: fix non-local lambda expression cannot have a
- capture-default
-
-We got away with this because GCC 4.8 (and apparently every GCC prior
-to 9) didn't notice or care, and because there is nothing referenced
-inside the lambda function body that isn't accessible from any other
-kind of function body (i.e. the capture wasn't needed at all).
-
-GCC 9 now enforces what the C++ standard said all along:  there is
-no need to allow capture-default in this case, so it is not.
-
-Fix by removing the offending capture-default.
-
-Fixes: https://github.com/Zygo/bees/issues/112
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- lib/error.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/error.cc b/lib/error.cc
-index f2a6db0..1d16a0a 100644
---- a/lib/error.cc
-+++ b/lib/error.cc
-@@ -32,7 +32,7 @@ namespace crucible {
- 
- 	// FIXME:  could probably avoid some of these levels of indirection
- 	static
--	function<void(string s)> current_catch_explainer = [&](string s) {
-+	function<void(string s)> current_catch_explainer = [](string s) {
- 		cerr << s << endl;
- 	};
- 
--- 
-2.23.0
-
diff --git a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch b/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
deleted file mode 100644
index 6d8d2ea530d5..000000000000
--- a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From f731ea8016c570243c783adef96681b535d9c927 Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <bees@furryterror.org>
-Date: Tue, 19 Nov 2019 16:01:31 -0500
-Subject: [PATCH 2/2] context: workaround to prevent LOGICAL_INO and btrfs
- balance from running concurrently
-
-This avoids some kernel bugs.  One of them is fixed in 5.3.4 and later:
-
-	efad8a853a "Btrfs: fix use-after-free when using the tree modification log"
-
-There are apparently others in current kernels, so for now just put bees
-on pause until the balance is done.
-
-At some point we may want to provide an option to disable this
-workaround; however, running bees and balance at the same time makes
-neither particularly fast, so maybe we'll just leave it this way.
-
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- src/bees-context.cc | 31 +++++++++++++++++++++++++++++++
- src/bees.h          |  4 ++++
- 2 files changed, 35 insertions(+)
-
-diff --git a/src/bees-context.cc b/src/bees-context.cc
-index 4e0a43e..0665019 100644
---- a/src/bees-context.cc
-+++ b/src/bees-context.cc
-@@ -760,11 +760,42 @@ BeesResolveAddrResult::BeesResolveAddrResult()
- {
- }
- 
-+void
-+BeesContext::wait_for_balance()
-+{
-+	Timer balance_timer;
-+	BEESNOTE("WORKAROUND: waiting for balance to stop");
-+	while (true) {
-+		btrfs_ioctl_balance_args args;
-+		memset_zero<btrfs_ioctl_balance_args>(&args);
-+		const int ret = ioctl(root_fd(), BTRFS_IOC_BALANCE_PROGRESS, &args);
-+		if (ret < 0) {
-+			// Either can't get balance status or not running, exit either way
-+			break;
-+		}
-+
-+		if (!(args.state & BTRFS_BALANCE_STATE_RUNNING)) {
-+			// Balance not running, doesn't matter if paused or cancelled
-+			break;
-+		}
-+
-+		BEESLOGDEBUG("WORKAROUND: Waiting " << balance_timer << "s for balance to stop");
-+		sleep(BEES_BALANCE_POLL_INTERVAL);
-+	}
-+}
-+
- BeesResolveAddrResult
- BeesContext::resolve_addr_uncached(BeesAddress addr)
- {
- 	THROW_CHECK1(invalid_argument, addr, !addr.is_magic());
- 	THROW_CHECK0(invalid_argument, !!root_fd());
-+
-+	// Is there a bug where resolve and balance cause a crash (BUG_ON at fs/btrfs/ctree.c:1227)?
-+	// Apparently yes, and more than one.
-+	// Wait for the balance to finish before we run LOGICAL_INO
-+	wait_for_balance();
-+
-+	// Time how long this takes
- 	Timer resolve_timer;
- 
- 	// There is no performance benefit if we restrict the buffer size.
-diff --git a/src/bees.h b/src/bees.h
-index da87d88..5c9375c 100644
---- a/src/bees.h
-+++ b/src/bees.h
-@@ -114,6 +114,9 @@ const size_t BEES_TRANSID_FACTOR = 10;
- // The actual limit in LOGICAL_INO seems to be 2730, but let's leave a little headroom
- const size_t BEES_MAX_EXTENT_REF_COUNT = 2560;
- 
-+// Wait this long for a balance to stop
-+const double BEES_BALANCE_POLL_INTERVAL = 60.0;
-+
- // Flags
- const int FLAGS_OPEN_COMMON   = O_NOFOLLOW | O_NONBLOCK | O_CLOEXEC | O_NOATIME | O_LARGEFILE | O_NOCTTY;
- const int FLAGS_OPEN_DIR      = FLAGS_OPEN_COMMON | O_RDONLY | O_DIRECTORY;
-@@ -708,6 +711,7 @@ class BeesContext : public enable_shared_from_this<BeesContext> {
- 	void set_root_fd(Fd fd);
- 
- 	BeesResolveAddrResult resolve_addr_uncached(BeesAddress addr);
-+	void wait_for_balance();
- 
- 	BeesFileRange scan_one_extent(const BeesFileRange &bfr, const Extent &e);
- 	void rewrite_file_range(const BeesFileRange &bfr);
--- 
-2.23.0
-
diff --git a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
deleted file mode 100644
index 9f53e5b37da3..000000000000
--- a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 0b7cf9c0f11722c7cb8a816e9118602b43d9a3f5 Mon Sep 17 00:00:00 2001
-From: Zygo Blaxell <bees@furryterror.org>
-Date: Tue, 29 Oct 2019 23:34:36 -0400
-Subject: [PATCH 3/3] process: Fix gettid() ambiguity with glibc >= 2.30
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In version 2.30 glibc added it's own gettid() function. This resulted in
-"error: call of overloaded ‘gettid()’ is ambiguous" because gettid()
-now exists in both namespace crucible and std.
-
-For now, use explicit references to namespace crucible.  This continues
-to work with new and old libc without having to test specific library
-versions.
-
-At some point, glibc gettid() will be deployed widely enough that we can
-remove the crucible version entirely.
-
-Signed-off-by: Zygo Blaxell <bees@furryterror.org>
----
- include/crucible/lockset.h | 4 ++--
- lib/chatter.cc             | 4 ++--
- src/bees.cc                | 6 +++---
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/include/crucible/lockset.h b/include/crucible/lockset.h
-index 856c55e..99500b7 100644
---- a/include/crucible/lockset.h
-+++ b/include/crucible/lockset.h
-@@ -117,7 +117,7 @@ namespace crucible {
- 		while (full() || locked(name)) {
- 			m_condvar.wait(lock);
- 		}
--		auto rv = m_set.insert(make_pair(name, gettid()));
-+		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
- 		THROW_CHECK0(runtime_error, rv.second);
- 	}
- 
-@@ -129,7 +129,7 @@ namespace crucible {
- 		if (full() || locked(name)) {
- 			return false;
- 		}
--		auto rv = m_set.insert(make_pair(name, gettid()));
-+		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
- 		THROW_CHECK1(runtime_error, name, rv.second);
- 		return true;
- 	}
-diff --git a/lib/chatter.cc b/lib/chatter.cc
-index cbd5adb..e5a24f9 100644
---- a/lib/chatter.cc
-+++ b/lib/chatter.cc
-@@ -69,14 +69,14 @@ namespace crucible {
- 			DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm));
- 
- 			header_stream << buf;
--			header_stream << " " << getpid() << "." << gettid() << "<" << m_loglevel << ">";
-+			header_stream << " " << getpid() << "." << crucible::gettid() << "<" << m_loglevel << ">";
- 			if (!m_name.empty()) {
- 				header_stream << " " << m_name;
- 			}
- 		} else {
- 			header_stream << "<" << m_loglevel << ">";
- 			header_stream << (m_name.empty() ? "thread" : m_name);
--			header_stream << "[" << gettid() << "]";
-+			header_stream << "[" << crucible::gettid() << "]";
- 		}
- 
- 		header_stream << ": ";
-diff --git a/src/bees.cc b/src/bees.cc
-index 08c3fd7..aa55af0 100644
---- a/src/bees.cc
-+++ b/src/bees.cc
-@@ -115,9 +115,9 @@ BeesNote::~BeesNote()
- 	tl_next = m_prev;
- 	unique_lock<mutex> lock(s_mutex);
- 	if (tl_next) {
--		s_status[gettid()] = tl_next;
-+		s_status[crucible::gettid()] = tl_next;
- 	} else {
--		s_status.erase(gettid());
-+		s_status.erase(crucible::gettid());
- 	}
- }
- 
-@@ -128,7 +128,7 @@ BeesNote::BeesNote(function<void(ostream &os)> f) :
- 	m_prev = tl_next;
- 	tl_next = this;
- 	unique_lock<mutex> lock(s_mutex);
--	s_status[gettid()] = tl_next;
-+	s_status[crucible::gettid()] = tl_next;
- }
- 
- void
--- 
-2.23.0
-