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 { +
