millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-09 00:10:21 +03:00
Code Packages Projects Releases Wiki Activity

sys-cluster/ceph: fix build w/ gcc-15

Browse Source 
Closes: https://bugs.gentoo.org/955362
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2025-05-08 10:42:28 +01:00
parent 6cfb7d15ce
commit a92e3eab08
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sys-cluster/ceph/ceph-19.2.2-r1.ebuild
View File

@@ -244,6 +244,7 @@ PATCHES=(
"${FILESDIR}/ceph-19.2.2-py313-1.patch"
"${FILESDIR}/ceph-19.2.2-py313-2.patch"
"${FILESDIR}/ceph-19.2.2-py313-3.patch"
"${FILESDIR}/ceph-19.2.2-gcc15.patch"
)
check-reqs_export_vars() {

38
sys-cluster/ceph/files/ceph-19.2.2-gcc15.patch Normal file
View File

@@ -0,0 +1,38 @@
https://bugs.gentoo.org/955362
https://github.com/ceph/ceph/pull/57430
From 830925f0dd196f920893b1947ae74171a202e825 Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 13 May 2024 08:16:46 +0800
Subject: [PATCH] rgw/driver/posix: s/is_value()/success()/
we have following build failure when building the tree:
```
/home/kefu/dev/ceph/src/rgw/driver/posix/zpp_bits.h:3457:19: error: no member named 'is_value' in 'value_or_errc<Type>'
3457 | if (other.is_value()) {
| ~~~~~ ^
In file included from /home/kefu/dev/ceph/src/rgw/driver/posix/rgw_sal_posix.cc:16:
In file included from /home/kefu/dev/ceph/src/rgw/driver/posix/rgw_sal_posix.h:22:
```
it turns out the class of `value_or_errc` does not have the member
function of `is_value()`, so let's use `success()` instead.
Signed-off-by: Kefu Chai <tchaikov@gmail.com>
---
src/rgw/driver/posix/zpp_bits.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/rgw/driver/posix/zpp_bits.h b/src/rgw/driver/posix/zpp_bits.h
index 90e8916b0b055..c9e99ec59c2f4 100644
--- a/src/rgw/driver/posix/zpp_bits.h
+++ b/src/rgw/driver/posix/zpp_bits.h
@@ -3454,7 +3454,7 @@ struct [[nodiscard]] value_or_errc
constexpr value_or_errc(value_or_errc && other) noexcept
{
- if (other.is_value()) {
+ if (other.success()) {
if constexpr (!std::is_void_v<Type>) {
if constexpr (!std::is_reference_v<Type>) {
::new (std::addressof(m_return_value))