From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1544676-garchives=archives.gentoo.org@lists.gentoo.org>
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 D186715800A
for <garchives@archives.gentoo.org>; Thu, 10 Aug 2023 21:02:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 208872BC01F;
Thu, 10 Aug 2023 21:02:32 +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) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0235A2BC01F
for <gentoo-commits@lists.gentoo.org>; Thu, 10 Aug 2023 21:02:31 +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) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D6210335D7C
for <gentoo-commits@lists.gentoo.org>; Thu, 10 Aug 2023 21:02:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D521F35
for <gentoo-commits@lists.gentoo.org>; Thu, 10 Aug 2023 21:02:29 +0000 (UTC)
From: "Patrick McLean" <chutzpah@gentoo.org>
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" <chutzpah@gentoo.org>
Message-ID: <1691701344.800d7e2da94dd545d984923b1b982abcfe201df6.chutzpah@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-cluster/ceph/ceph-16.2.13-r1.ebuild sys-cluster/ceph/ceph-16.2.13-r2.ebuild sys-cluster/ceph/ceph-17.2.6-r5.ebuild sys-cluster/ceph/ceph-17.2.6-r6.ebuild
X-VCS-Directories: sys-cluster/ceph/
X-VCS-Committer: chutzpah
X-VCS-Committer-Name: Patrick McLean
X-VCS-Revision: 800d7e2da94dd545d984923b1b982abcfe201df6
X-VCS-Branch: master
Date: Thu, 10 Aug 2023 21:02:29 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 11124456-3282-4151-89cb-26c7f9d5b126
X-Archives-Hash: 380ac97ccb9d2dd38465228dd205a2e4
commit: 800d7e2da94dd545d984923b1b982abcfe201df6
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 10 20:39:35 2023 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Aug 10 21:02:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=800d7e2d
sys-cluster/ceph: Revbumps, use bundled libfmt
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 <AT> gentoo.org>
.../ceph/{ceph-16.2.13-r1.ebuild => ceph-16.2.13-r2.ebuild} | 3 ++-
.../ceph/{ceph-17.2.6-r5.ebuild => ceph-17.2.6-r6.ebuild} | 9 ++-------
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/sys-cluster/ceph/ceph-16.2.13-r1.ebuild b/sys-cluster/ceph/ceph-16.2.13-r2.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-16.2.13-r1.ebuild
rename to sys-cluster/ceph/ceph-16.2.13-r2.ebuild
index 5077fc2be131..dccc03e507a4 100644
--- a/sys-cluster/ceph/ceph-16.2.13-r1.ebuild
+++ b/sys-cluster/ceph/ceph-16.2.13-r2.ebuild
@@ -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
)
diff --git a/sys-cluster/ceph/ceph-17.2.6-r5.ebuild b/sys-cluster/ceph/ceph-17.2.6-r6.ebuild
similarity index 97%
rename from sys-cluster/ceph/ceph-17.2.6-r5.ebuild
rename to sys-cluster/ceph/ceph-17.2.6-r6.ebuild
index 16a9a26387dc..2d7cf423fb87 100644
--- a/sys-cluster/ceph/ceph-17.2.6-r5.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.6-r6.ebuild
@@ -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
)