| 1 |
commit: dfd010b1e7b61d35f957a37573f8c755695f9200 |
| 2 |
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 17 18:05:44 2023 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 17 18:07:14 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfd010b1 |
| 7 |
|
| 8 |
sys-cluster/ceph: Attempt to fix bug #901403 |
| 9 |
|
| 10 |
I am unable to reproduce this locally, but this *should* fix it. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/901403 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
sys-cluster/ceph/ceph-17.2.5-r3.ebuild | 5 ++++- |
| 16 |
sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch | 10 ++++++++++ |
| 17 |
2 files changed, 14 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild |
| 20 |
index a99834673e30..2221ccb8e94e 100644 |
| 21 |
--- a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild |
| 22 |
+++ b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild |
| 23 |
@@ -9,9 +9,10 @@ LUA_COMPAT=( lua5-{3..4} ) |
| 24 |
inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \ |
| 25 |
python-r1 udev readme.gentoo-r1 toolchain-funcs systemd tmpfiles |
| 26 |
|
| 27 |
+XSIMD_HASH="aeec9c872c8b475dedd7781336710f2dd2666cb2" |
| 28 |
SRC_URI=" |
| 29 |
https://download.ceph.com/tarballs/${P}.tar.gz |
| 30 |
- parquet? ( https://github.com/xtensor-stack/xsimd/archive/aeec9c872c8b475dedd7781336710f2dd2666cb2.tar.gz -> ceph-xsimd-${PV}.tar.gz ) |
| 31 |
+ parquet? ( https://github.com/xtensor-stack/xsimd/archive/${XSIMD_HASH}.tar.gz -> ceph-xsimd-${PV}.tar.gz ) |
| 32 |
" |
| 33 |
KEYWORDS="~amd64 ~arm64" |
| 34 |
|
| 35 |
@@ -221,6 +222,8 @@ PATCHES=( |
| 36 |
"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch" |
| 37 |
"${FILESDIR}/ceph-17.2.5-gcc13.patch" |
| 38 |
"${FILESDIR}/ceph-17.2.5-boost-1.81.patch" |
| 39 |
+ # https://bugs.gentoo.org/901403 |
| 40 |
+ "${FILESDIR}/ceph-17.2.5-link-boost-context.patch" |
| 41 |
) |
| 42 |
|
| 43 |
check-reqs_export_vars() { |
| 44 |
|
| 45 |
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 |
| 46 |
new file mode 100644 |
| 47 |
index 000000000000..9ebc70ecce9e |
| 48 |
--- /dev/null |
| 49 |
+++ b/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch |
| 50 |
@@ -0,0 +1,10 @@ |
| 51 |
+diff --git a/src/neorados/CMakeLists.txt b/src/neorados/CMakeLists.txt |
| 52 |
+index 3c7aee7c6fe..bda666ea95b 100644 |
| 53 |
+--- a/src/neorados/CMakeLists.txt |
| 54 |
++++ b/src/neorados/CMakeLists.txt |
| 55 |
+@@ -41,4 +41,4 @@ target_link_libraries(libneorados PRIVATE |
| 56 |
+ # install(TARGETS libneorados DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
| 57 |
+ add_library(neorados_cls_fifo STATIC cls/fifo.cc) |
| 58 |
+ target_link_libraries(neorados_cls_fifo PRIVATE |
| 59 |
+- libneorados ceph-common fmt::fmt) |
| 60 |
++ libneorados ceph-common fmt::fmt Boost::context) |
Archives