From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DC77115A7D9 for ; Fri, 17 Mar 2023 18:07:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27AA8E0A94; Fri, 17 Mar 2023 18:07:41 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0611BE0A94 for ; Fri, 17 Mar 2023 18:07:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 205E5341288 for ; Fri, 17 Mar 2023 18:07:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF75873E for ; Fri, 17 Mar 2023 18:07:38 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1679076434.dfd010b1e7b61d35f957a37573f8c755695f9200.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/, sys-cluster/ceph/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-17.2.5-r3.ebuild sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch X-VCS-Directories: sys-cluster/ceph/files/ sys-cluster/ceph/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: dfd010b1e7b61d35f957a37573f8c755695f9200 X-VCS-Branch: master Date: Fri, 17 Mar 2023 18:07:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 087d21e7-599c-4259-84ac-3db75641ab5c X-Archives-Hash: 46dd1065c4a2b784198cf03f2894215b commit: dfd010b1e7b61d35f957a37573f8c755695f9200 Author: Patrick McLean gentoo org> AuthorDate: Fri Mar 17 18:05:44 2023 +0000 Commit: Patrick McLean gentoo 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 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)