summaryrefslogtreecommitdiff
path: root/sys-cluster/ceph
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-06-09 21:49:23 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-06-09 21:49:23 +0100
commitb8cc45d2d4557cadf73e3411149ffb57ebd8c09b (patch)
tree36e9e50b71907f13105d2d76cda896f2097f8201 /sys-cluster/ceph
parent60010a4cd6d7c12aaa62f00b5e8a158ed24efba6 (diff)
gentoo auto-resync : 09:06:2023 - 21:49:23
Diffstat (limited to 'sys-cluster/ceph')
-rw-r--r--sys-cluster/ceph/Manifest2
-rw-r--r--sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch37
-rw-r--r--sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch10
3 files changed, 0 insertions, 49 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index c8a931761735..6383f8b7a1bf 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -28,8 +28,6 @@ AUX ceph-17.2.3-flags.patch 782 BLAKE2B 08cd4fefdce90bc42b9c4e3caff805b1d8c9d011
AUX ceph-17.2.4-cyclic-deps.patch 562 BLAKE2B 4562e7b6afdb23e2d0c65c5db61aef6ce7d313716ef1e40c5b12a6afcb91ae8a38ead8432fe6ee93eeee12444c5b971d9c2ccb866c20806b8f3a57c9d8668b3c SHA512 5028bda954938a8718be6bc4729e816a178a2f47c3a2eeffdcb6b357d054fe236eba54fb0067dfbf6f6a78b5f6d805fe427f0d2e5b0349a08b2404604083132c
AUX ceph-17.2.5-boost-1.81.patch 1456 BLAKE2B 0dbff43d17f099242e1bf0d44f6c46c6175a4c9221fdd904a152cab8a1105cb94960b7519471d86a359c35a356a7c793de2a2ac7d3cb7880dcb044ad93ac44e4 SHA512 2dcb4d7e42ab71c97c601a7171075077966c6d3bfea1a0cc7676bcc03bb3bf5a4fca774bca571c908a6450098b48951ac5fc12f6121e015b6ac56deb5d514048
AUX ceph-17.2.5-gcc13-deux.patch 2775 BLAKE2B 9ff9a80a87417206099490d47027df0d758aa5347a09840bc736a1a7a26f613226e681e2ee7a77d85ca9e97891ca79013ca2fd33500216abe5bcd2b4895b7226 SHA512 1ac1d35c77c608fe3bb0dd0e965817ff2d4eb4a02216f7eb41a20c505e5be9eccac729c3490a2466d3251f314442296cfb7b110c62828f584ddb5bab6116d02c
-AUX ceph-17.2.5-gcc13.patch 2917 BLAKE2B 9c41c0490932fc1f28bb647f7911189cf440517673c98b09c50a86467cd4478d11067a14ea57b10113e67e7772525cbee525e2855261322ff9e8cbd47a3268c5 SHA512 a0c720e624cef883c0360d043a4c3d49a4dfca2f0e4b3f73da9318615a3a5ff506baa133a140403b9a90fc87bddb6fbe58691f629f1cb689a21b732855343b44
-AUX ceph-17.2.5-link-boost-context.patch 492 BLAKE2B 828665f353890d92b586928421d6eee837a095c371e458d166cf6c6e9663b5ca9f71f74961c3db8731e042c31153f766457813fbcc50114631bb569a15f683f8 SHA512 b794685a7b6fc36267ea668232e12cd480b307f207dbbeafdbc874147925c24bc5497b7056106f2c1feea197835856aaaaeec399fe53f76fc274dc03c9d69a5d
AUX ceph-17.2.5-suppress-cmake-warning.patch 370 BLAKE2B 225ee73ddc24e3b398243603292949da09417c4c928daf0328729d8a69a475e6e5cdd2c9911c4c2ff6f3a6fea8b785a210e4beab5dc7bd910e390e84aa8e4b61 SHA512 e71ead89e494ac5639c08764b4d7bc3a96f87bac4ea8f9adb3e29c568f5d970551bc568c55adfd1b21be575db39a6f494de3e9d091d4ae8c04d2d5421be24f4f
AUX ceph-17.2.6-arrow-flatbuffers-c++14.patch 3905 BLAKE2B 89e1860ff9be4ae899d99f71986a6616636dd8f5c6e1e06fdb2f5500cf86eb374b65f0364b4ca23e3c933ce3f705a0c0b6125bac77b4d66cb76ee1b4a289ba43 SHA512 8be91877d6d6f64b385e8a3914be761ecff8fb6575480e054aa738b036eace86a4dc923b3de6f554925bde55e95b2a26fd6bb2bf6ec552b12db0801600e50a60
AUX ceph-17.2.6-cmake.patch 3014 BLAKE2B bfe19b9667c6b2952b8d09978404d6c1600572ab8adfdd4533a6dd6249d87cefef7da605260612f78a35d9f6af177487bb0a5db88a42e5a8660fc54b0c12ee5b SHA512 b007de53dd0e1e1cc972c9c98205d0957e0d568fadc2d9e4588b5c13e80e4f24915c0e48b347093c7039b3a7e43ca6e9c51a0ebf51a016270ff40e634857ba68
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch b/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch
deleted file mode 100644
index c23badcc5e09..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.5-gcc13.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugs.gentoo.org/878531
-https://github.com/ceph/ceph/pull/48661
-
-From 74794f9d6f5c6671438085bdba730b504901a7c0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 28 Oct 2022 16:47:38 +0100
-Subject: [PATCH] common: fix build with GCC 13 (missing <cstdint> include)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Needed for uint8_t. Only worked by chance before (see
-https://www.gnu.org/software/gcc/gcc-13/porting_to.html).
-
-```
-FAILED: src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o
-/usr/bin/x86_64-pc-linux-gnu-g++ -DBOOST_ASIO_DISABLE_THREAD_KEYWORD_EXTENSION -DHAVE_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D_REENTRANT -D_THREAD_SAFE -D__CEPH__ -D__STDC_FORMAT_MACROS -D__linux__ -I/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5_build/src/include -I/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5_build/include -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/xxHash -isystem /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/rapidjson/include -O2 -march=native -pipe -fPIC -U_FORTIFY_SOURCE -Wall -fno-strict-aliasing -fsigned-char -Wtype-limits -Wignored-qualifiers -Wpointer-arith -Werror=format-security -Winit-self -Wno-unknown-pragmas -Wnon-virtual-dtor -Wno-ignored-qualifiers -ftemplate-depth-1024 -Wpessimizing-move -Wredundant-move -Wstrict-null-sentinel -Woverloaded-virtual -fno-new-ttp-matching -fstack-protector-strong -fdiagnostics-color=auto -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -std=c++17 -MD -MT src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o -MF src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o.d -o src/CMakeFiles/common-objs.dir/mds/FSMapUser.cc.o -c /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.cc
-In file included from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/log/SubsystemMap.h:12,
- from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/common/config.h:23,
- from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/mdstypes.h:13,
- from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.h:21,
- from /var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/mds/FSMapUser.cc:1:
-/var/tmp/portage/sys-cluster/ceph-17.2.5/work/ceph-17.2.5/src/common/subsys_types.h:56:23: error: ‘uint8_t’ in namespace ‘std’ does not name a type; did you mean ‘wint_t’?
-```
-
-Bug: https://bugs.gentoo.org/878531
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/common/subsys_types.h
-+++ b/src/common/subsys_types.h
-@@ -17,6 +17,7 @@
-
- #include <algorithm>
- #include <array>
-+#include <cstdint>
-
- enum ceph_subsys_id_t {
- ceph_subsys_, // default
diff --git a/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch b/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
deleted file mode 100644
index 9ebc70ecce9e..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.5-link-boost-context.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/src/neorados/CMakeLists.txt b/src/neorados/CMakeLists.txt
-index 3c7aee7c6fe..bda666ea95b 100644
---- a/src/neorados/CMakeLists.txt
-+++ b/src/neorados/CMakeLists.txt
-@@ -41,4 +41,4 @@ target_link_libraries(libneorados PRIVATE
- # install(TARGETS libneorados DESTINATION ${CMAKE_INSTALL_LIBDIR})
- add_library(neorados_cls_fifo STATIC cls/fifo.cc)
- target_link_libraries(neorados_cls_fifo PRIVATE
-- libneorados ceph-common fmt::fmt)
-+ libneorados ceph-common fmt::fmt Boost::context)