From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1508880-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 02DBF15ACFB
for <garchives@archives.gentoo.org>; Tue, 18 Apr 2023 08:46:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 39617E0932;
Tue, 18 Apr 2023 08:46:56 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 11C02E0932
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Apr 2023 08:46:56 +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 3520F33BEE9
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Apr 2023 08:46:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C6918A1D
for <gentoo-commits@lists.gentoo.org>; Tue, 18 Apr 2023 08:46:52 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1681807600.fe44cb66634c6a364804f0f1c7c94a773cea96f9.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/, sys-cluster/ceph/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-cluster/ceph/ceph-17.2.5-r3.ebuild sys-cluster/ceph/ceph-17.2.6.ebuild sys-cluster/ceph/files/ceph-17.2.5-gcc13-deux.patch
X-VCS-Directories: sys-cluster/ceph/ sys-cluster/ceph/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: fe44cb66634c6a364804f0f1c7c94a773cea96f9
X-VCS-Branch: master
Date: Tue, 18 Apr 2023 08:46:52 +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: 2bdbe130-8f4d-4d78-bf32-3c7ffe2dc625
X-Archives-Hash: ed623a7c6e4b0f4ce83d8f80c6a0dbcc
commit: fe44cb66634c6a364804f0f1c7c94a773cea96f9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 08:46:06 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 08:46:40 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe44cb66
sys-cluster/ceph: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/892501
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/ceph/ceph-17.2.5-r3.ebuild | 1 +
sys-cluster/ceph/ceph-17.2.6.ebuild | 1 +
.../ceph/files/ceph-17.2.5-gcc13-deux.patch | 94 ++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
index 2221ccb8e94e..29bdfc8cecf8 100644
--- a/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.5-r3.ebuild
@@ -221,6 +221,7 @@ PATCHES=(
# https://bugs.gentoo.org/866165
"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
"${FILESDIR}/ceph-17.2.5-gcc13.patch"
+ "${FILESDIR}/ceph-17.2.5-gcc13-deux.patch"
"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
# https://bugs.gentoo.org/901403
"${FILESDIR}/ceph-17.2.5-link-boost-context.patch"
diff --git a/sys-cluster/ceph/ceph-17.2.6.ebuild b/sys-cluster/ceph/ceph-17.2.6.ebuild
index aa370edc1017..90bd3470f2ff 100644
--- a/sys-cluster/ceph/ceph-17.2.6.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.6.ebuild
@@ -220,6 +220,7 @@ PATCHES=(
"${FILESDIR}/ceph-17.2.4-cyclic-deps.patch"
# https://bugs.gentoo.org/866165
"${FILESDIR}/ceph-17.2.5-suppress-cmake-warning.patch"
+ "${FILESDIR}/ceph-17.2.5-gcc13-deux.patch"
"${FILESDIR}/ceph-17.2.5-boost-1.81.patch"
# https://bugs.gentoo.org/901403
"${FILESDIR}/ceph-17.2.6-link-boost-context.patch"
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-gcc13-deux.patch b/sys-cluster/ceph/files/ceph-17.2.5-gcc13-deux.patch
new file mode 100644
index 000000000000..1bfe7fdbf52f
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.5-gcc13-deux.patch
@@ -0,0 +1,94 @@
+https://bugs.gentoo.org/892501
+https://src.fedoraproject.org/rpms/ceph/c/945dc70d291321704f3218faa7c3efe70687ce27?branch=rawhide
+--- a/src/common/subsys_types.h
++++ b/src/common/subsys_types.h
+@@ -53,7 +53,7 @@
+ #undef DEFAULT_SUBSYS
+ }
+
+-constexpr static std::uint8_t
++constexpr static uint8_t
+ ceph_subsys_get_max_default_level(const std::size_t subidx) {
+ const auto item = ceph_subsys_get_as_array()[subidx];
+ return std::max(item.log_level, item.gather_level);
+--- a/src/msg/async/compression_onwire.h
++++ b/src/msg/async/compression_onwire.h
+@@ -44,7 +44,7 @@
+
+ class TxHandler final : private Handler {
+ public:
+- TxHandler(CephContext* const cct, CompressorRef compressor, int mode, std::uint64_t min_size)
++ TxHandler(CephContext* const cct, CompressorRef compressor, int mode, uint64_t min_size)
+ : Handler(cct, compressor),
+ m_min_size(min_size),
+ m_mode(static_cast<Compressor::CompressionMode>(mode))
+@@ -97,7 +97,7 @@
+ static rxtx_t create_handler_pair(
+ CephContext* ctx,
+ const CompConnectionMeta& comp_meta,
+- std::uint64_t compress_min_size);
++ uint64_t compress_min_size);
+ };
+ }
+
+--- a/src/msg/async/crypto_onwire.h
++++ b/src/msg/async/crypto_onwire.h
+@@ -95,7 +95,7 @@
+ // Transmitter can append extra bytes of ciphertext at the -final step.
+ // This method return how much was added, and thus let client translate
+ // plaintext size into ciphertext size to grab from wire.
+- virtual std::uint32_t get_extra_size_at_final() = 0;
++ virtual uint32_t get_extra_size_at_final() = 0;
+
+ // Instance of RxHandler must be reset before doing any decrypt-update
+ // step. This applies also to situation when decrypt-final was already
+--- a/src/common/Cycles.h
++++ b/src/common/Cycles.h
+@@ -29,8 +29,9 @@
+ */
+
+
+-#ifndef CEPH_CYCLES_H
+-#define CEPH_CYCLES_H
++#pragma once
++
++#include <cstdint>
+
+ /**
+ * This class provides static methods that read the fine-grain CPU
+@@ -112,4 +113,3 @@
+ }
+ };
+
+-#endif // CEPH_CYCLES_H
+--- a/src/test/librados/op_speed.cc
++++ b/src/test/librados/op_speed.cc
+@@ -9,7 +9,7 @@
+ for (int i = 0; i < to_create; ++i) {
+ librados::ObjectReadOperation op;
+ bufferlist bl;
+- std::uint64_t sz;
++ uint64_t sz;
+ struct timespec tm;
+ std::map<std::string, ceph::buffer::list> xattrs;
+ std::map<std::string, ceph::buffer::list> omap;
+--- a/src/test/mon/test_log_rss_usage.cc
++++ b/src/test/mon/test_log_rss_usage.cc
+@@ -5,6 +5,7 @@
+ #include <string>
+ #include <iostream>
+ #include <fstream>
++#include <cstdint>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
+--- a/src/librbd/api/PoolMetadata.h
++++ b/src/librbd/api/PoolMetadata.h
+@@ -9,6 +9,7 @@
+
+ #include <map>
+ #include <string>
++#include <cstdint>
+
+ namespace librbd {
+