gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-cluster/ceph: Revbumps, use bundled libfmt

Browse Source 
Too many API changes makes for an annoying game of whack-a-mole. Going to use
bundled for now.

Closes: https://bugs.gentoo.org/895254
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
This commit is contained in:
Patrick McLean
2023-08-10 13:39:35 -07:00
parent dbcb83cdbe
commit 800d7e2da9
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sys-cluster/ceph/ceph-16.2.13-r1.ebuild → sys-cluster/ceph/ceph-16.2.13-r2.ebuild
View File

@@ -47,7 +47,6 @@ DEPEND="
dev-cpp/gflags:=
<dev-libs/leveldb-1.23:=[snappy,tcmalloc(-)?]
dev-libs/libaio:=
<dev-libs/libfmt-9:=
dev-libs/libnl:3=
dev-libs/libxml2:=
dev-libs/libevent:=
@@ -318,6 +317,8 @@ ceph_src_configure() {
-DWITH_RDMA:BOOL=$(usex rdma)
-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
# use the bundled libfmt for now since they seem to constantly break their API
-DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON
-Wno-dev
)

9
sys-cluster/ceph/ceph-17.2.6-r5.ebuild → sys-cluster/ceph/ceph-17.2.6-r6.ebuild
View File

@@ -33,8 +33,6 @@ IUSE="
IUSE+="$(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
# <dev-libs/libfmt-10 because we're using -DFMT_DEPRECATED_OSTREAM for bug #895254
# See https://github.com/ceph/ceph/pull/49768 for a fix for newer versions.
DEPEND="
${LUA_DEPS}
${PYTHON_DEPS}
@@ -51,7 +49,6 @@ DEPEND="
dev-cpp/gflags:=
dev-lang/jsonnet:=
dev-libs/libaio:=
<dev-libs/libfmt-10:=
dev-libs/libnl:3=
dev-libs/libxml2:=
dev-libs/libevent:=
@@ -257,10 +254,6 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
# Add compatibility hack for fmt-9, this won't work with fmt-10 though.
# See bug #895254. Should be fixed upstream properly by https://github.com/ceph/ceph/pull/49768.
append-cppflags -DFMT_DEPRECATED_OSTREAM
if use system-boost; then
find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
| xargs --null sed -r \
@@ -336,6 +329,8 @@ ceph_src_configure() {
-DWITH_RDMA:BOOL=$(usex rdma)
-DCMAKE_INSTALL_DOCDIR:PATH="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
-DCMAKE_INSTALL_SYSCONFDIR:PATH="${EPREFIX}/etc"
# use the bundled libfmt for now since they seem to constantly break their API
-DCMAKE_DISABLE_FIND_PACKAGE_fmt=ON
-Wno-dev
)