From 532217f7c688b683c2e00b172963faf7f0a28f40 Mon Sep 17 00:00:00 2001 From: hazen2215 Date: Mon, 3 Jul 2023 23:37:33 +0900 Subject: [PATCH] bees: fix build on musl & platforms without 64-bit atomics --- srcpkgs/bees/patches/pthread_getname1.patch | 23 +++++++++++++++++++++ srcpkgs/bees/patches/series | 1 + srcpkgs/bees/template | 4 ++-- 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/bees/patches/pthread_getname1.patch diff --git a/srcpkgs/bees/patches/pthread_getname1.patch b/srcpkgs/bees/patches/pthread_getname1.patch new file mode 100644 index 000000000000..2dcc4c63d589 --- /dev/null +++ b/srcpkgs/bees/patches/pthread_getname1.patch @@ -0,0 +1,23 @@ +--- a/lib/task.cc ++++ b/lib/task.cc +@@ -289,7 +289,6 @@ + lock.unlock(); + + char buf[24] = { 0 }; +- DIE_IF_MINUS_ERRNO(pthread_getname_np(pthread_self(), buf, sizeof(buf))); + DIE_IF_MINUS_ERRNO(pthread_setname_np(pthread_self(), m_title.c_str())); + + TaskStatePtr this_task = shared_from_this(); +--- a/src/bees-trace.cc ++++ b/src/bees-trace.cc +@@ -136,10 +136,6 @@ + // OK try the pthread name next. + char buf[24]; + memset(buf, '\0', sizeof(buf)); +- int err = pthread_getname_np(pthread_self(), buf, sizeof(buf)); +- if (err) { +- return string("pthread_getname_np: ") + strerror(err); +- } + buf[sizeof(buf) - 1] = '\0'; + + // thread_getname_np returns process name diff --git a/srcpkgs/bees/patches/series b/srcpkgs/bees/patches/series index d9a2837128f2..c0258b77f4a2 100644 --- a/srcpkgs/bees/patches/series +++ b/srcpkgs/bees/patches/series @@ -1,2 +1,3 @@ 0001-don-t-run-tests-unless-asked.patch 0002-move-sbin-into-bin.patch +pthread_getname1.patch diff --git a/srcpkgs/bees/template b/srcpkgs/bees/template index 9cd43f1d8277..e0ee8679c62b 100644 --- a/srcpkgs/bees/template +++ b/srcpkgs/bees/template @@ -2,7 +2,6 @@ pkgname=bees version=0.8 revision=1 -archs="~*-musl" build_style=gnu-makefile make_check_target="test" hostmakedepends="pkg-config" @@ -24,7 +23,8 @@ if [ "$CROSS_BUILD" ]; then fi if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then - broken="undefined reference to __atomic_fetch_add_8" + makedepends+=" libatomic-devel" + CXXFLAGS+=" -latomic" fi pre_build() {