[gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/, sys-cluster/ceph/files/

["Patrick McLean" <chutzpah@gentoo.org>]

commit:     dfd010b1e7b61d35f957a37573f8c755695f9200
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 18:05:44 2023 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 18:07:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd010b1

sys-cluster/ceph: Attempt to fix bug #901403

I am unable to reproduce this locally, but this *should* fix it.

Closes: https://bugs.gentoo.org/901403
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>

 sys-cluster/ceph/ceph-17.2.5-r3.ebuild                      |  5 ++++-
 sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
index a99834673e30..2221ccb8e94e 100644
--- a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
@@ -9,9 +9,10 @@ LUA_COMPAT=( lua5-{3..4} )
 inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \
 		python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles
 
+XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2"
 SRC_URI="
 	https://download.ceph.com/tarballs/${P}.tar.gz
-	parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-${PV}.tar.gz )
+	parquet? ( https://github.com/xtensor-stack/xsimd/archive/${XSIMD_HASH}.tar.gz -> ceph-xsimd-${PV}.tar.gz )
 "
 KEYWORDS="~amd64 ~arm64"
 
@@ -221,6 +222,8 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
 	"${FILESDIR}/ceph-17.2.5-gcc13.patch"
 	"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
+	# https://bugs.gentoo.org/901403
+	"${FILESDIR}/ceph-17.2.5-link-boost-context.patch"
 )
 
 check-reqs_export_vars() {

diff --git a/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch b/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
new file mode 100644
index 000000000000..9ebc70ecce9e
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
@@ -0,0 +1,10 @@
+diff --git a/src/neorados/CMakeLists.txt b/src/neorados/CMakeLists.txt
+index 3c7aee7c6fe..bda666ea95b 100644
+--- a/src/neorados/CMakeLists.txt
++++ b/src/neorados/CMakeLists.txt
+@@ -41,4 +41,4 @@ target_link_libraries(libneorados PRIVATE
+ # install(TARGETS libneorados DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ add_library(neorados_cls_fifo STATIC cls/fifo.cc)
+ target_link_libraries(neorados_cls_fifo PRIVATE
+-	libneorados ceph-common fmt::fmt)
++	libneorados ceph-common fmt::fmt Boost::context)