commit: 69d5bb0fac0d9f01c4e5f886260a4da409f4bb4d
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sun May 11 09:42:40 2025 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sun May 11 09:44:26 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d5bb0f
sys-cluster/ceph: Improve boost handling
Make boost patches conditional so building
with old and new versions works
Signed-off-by: Patrick Lauer <patrick <AT> gentoo.org>
sys-cluster/ceph/{ceph-19.2.2-r2.ebuild => ceph-19.2.2-r3.ebuild} | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/sys-cluster/ceph/ceph-19.2.2-r2.ebuild
b/sys-cluster/ceph/ceph-19.2.2-r3.ebuild
similarity index 98%
rename from sys-cluster/ceph/ceph-19.2.2-r2.ebuild
rename to sys-cluster/ceph/ceph-19.2.2-r3.ebuild
index 66c5d87b4459..6cb5447c322f 100644
--- a/sys-cluster/ceph/ceph-19.2.2-r2.ebuild
+++ b/sys-cluster/ceph/ceph-19.2.2-r3.ebuild
@@ -245,8 +245,6 @@ PATCHES=(
"${FILESDIR}/ceph-19.2.2-py313-2.patch"
"${FILESDIR}/ceph-19.2.2-py313-3.patch"
"${FILESDIR}/ceph-19.2.2-gcc15.patch"
- "${FILESDIR}/ceph-19.2.2-boost188.patch"
- "${FILESDIR}/ceph-19.2.2-boost-linking.patch"
)
check-reqs_export_vars() {
@@ -277,6 +275,10 @@ src_prepare() {
cmake_src_prepare
if use system-boost; then
+ if has_version '>=dev-libs/boost-1.88'; then
+ eapply "${FILESDIR}/ceph-19.2.2-boost188.patch"
+ eapply "${FILESDIR}/ceph-19.2.2-boost-linking.patch"
+ fi
find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
| xargs --null sed -r \
-e 's|Boost::|boost_|g' \
