gentoo auto-resync : 04:06:2023 - 09:34:05

3 files changed, 85 insertions, 2 deletions

diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
index c5a79f1a74db..415ce86bfb44 100644
--- a/sys-cluster/ceph/Manifest
+++ b/sys-cluster/ceph/Manifest
@@ -32,6 +32,7 @@ AUX ceph-17.2.5-gcc13.patch 2917 BLAKE2B 9c41c0490932fc1f28bb647f7911189cf440517
 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
 AUX ceph-17.2.6-link-boost-context.patch 522 BLAKE2B 7f50f179324d74a372a038cb183297f9ecac7095a71a810d0d8063d2f80c31013db029e0067ab3b689faa1d4967ed04e077f279a203414e3ce49ddbc6b552e2c SHA512 3b15869a5e9bddbec752f3f612c4c53bf95c8da21a573b92af90f0f9823dddcdeaffef850c2d84bb4ee8bde8ce30a92e0f911c0e9e9007fb44aa8279b5cbec5e
 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d
 AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8
@@ -53,5 +54,5 @@ DIST ceph-xsimd-17.2.6.tar.gz 173025 BLAKE2B 54679c24804c195ae55b9f49589e331dde9
 EBUILD ceph-16.2.13.ebuild 12486 BLAKE2B d02ddb432b12e9dea0f7244235dbe6c9232404a6743b6e6222e8d70998ef413ef4a68e453063a15538666dc84895d63f04cfa79c40f9686af5a7f7c25ab3b336 SHA512 fa654d708ff451db30fdebbb4733be6d31c50d962b324986e7272e20a0e136b006749f679dd573d70043c37fa40ec31445fb8ad4301f67cfd260fca26d76e2e3
 EBUILD ceph-17.2.5-r6.ebuild 13085 BLAKE2B 7c537acc8ad2a8b8b870b75c097c55a5b42f0fd0273d212092d0ac96e9ba783db89b62372edd1cafb65ab449803753abb68c82da00bc49337d5a2cc9500718f8 SHA512 bfb52a492f873c986834b02d9804981389377d7df51d25103fed1adeb92956d2a81508fcc25f72e4c0eeda81a2af37265120d546e6f8dcca54814fd0367e469b
 EBUILD ceph-17.2.6-r2.ebuild 13094 BLAKE2B 9a85e922be0a649fe63723b7621abeacb9148da733c1f0d7b076d96fca1672f2a0742cccf01101d5331d730e23d2b29c41a704fc877329ec7076cea398b2cc15 SHA512 2f5385a1373ad6e4383e69e6c2598ec28e45811b839d3ba1a248b9f8ac9f62b4c17e61ef0c6eec6b4c272be46c8be17d23dd85e9198ec9f12f630ce98876a800
-EBUILD ceph-17.2.6-r3.ebuild 13532 BLAKE2B b64e17d8c01a0d7f17ec72fe23b7b9b25edb5c10be8f469218812bf23daba84893edada6b6835bc0604b73793fd17bfb6e6ae31bf7b63e9a97809296477870ac SHA512 cbf2b278f64da51333fc660ac1dc6d791afb9e9655b1020a0bcb7d7802dcfca1d2002d39abf45e4730f8131c69728b8bc91ff505a690471f053a3f9733d48bf4
+EBUILD ceph-17.2.6-r3.ebuild 13606 BLAKE2B 3af12b4441c87ba68f2f41885a6c91e31ea390340a3a03cec8ab484e6bba27c6823062dcffb51646666a8a41a3c279105f5c2473e8006e2ce918795053ad32ce SHA512 f8bd10a3bc65745a896798208e564fb7b535a99753bb6c691e5ab2b5a858b0a76352940f2b4f162f30bf8f861c6228d57fbf85d7acac4f8738a7104d0f3b949e
 MISC metadata.xml 2504 BLAKE2B df35722094ef7fbc1ecd16d3784e8589958a8d4e2f915e84f41e6ce5191256697a73eb9d3d658089afaaa82a5b23bdf7097870a15e43029d2598bb1792a4b571 SHA512 b0c03c35876eccf78360914237fdef8925963b21f78fd8516e8506150cce36a901562e33e6fab102dd5a4e727f9a4422eb136e5b64d46b9538fb4450b3467b2b
diff --git a/sys-cluster/ceph/ceph-17.2.6-r3.ebuild b/sys-cluster/ceph/ceph-17.2.6-r3.ebuild
index 259638cf91a1..0c028dec1610 100644
--- a/sys-cluster/ceph/ceph-17.2.6-r3.ebuild
+++ b/sys-cluster/ceph/ceph-17.2.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 LUA_COMPAT=( lua5-{3..4} )
 
 inherit check-reqs bash-completion-r1 cmake flag-o-matic lua-single \
@@ -227,6 +227,8 @@ PATCHES=(
 	"${FILESDIR}/ceph-17.2.6-link-boost-context.patch"
 	# https://bugs.gentoo.org/905626
 	"${FILESDIR}/ceph-17.2.6-arrow-flatbuffers-c++14.patch"
+	# https://bugs.gentoo.org/868891
+	"${FILESDIR}/ceph-17.2.6-cmake.patch"
 )
 
 check-reqs_export_vars() {
diff --git a/sys-cluster/ceph/files/ceph-17.2.6-cmake.patch b/sys-cluster/ceph/files/ceph-17.2.6-cmake.patch
new file mode 100644
index 000000000000..82bf399fb6f1
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph-17.2.6-cmake.patch
@@ -0,0 +1,80 @@
+https://bugs.gentoo.org/868891
+https://github.com/ceph/ceph/pull/49517
+
+From aa4b3652399b317652407959ee880982d4f648de Mon Sep 17 00:00:00 2001
+From: jinqiang zhang <peeweep@0x0.ee>
+Date: Tue, 20 Dec 2022 04:28:52 +0000
+Subject: [PATCH 1/2] cmake: fix common-msg-objs can't find common-options-objs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+compile ceph-17.2.5 failed with follow error message:
+
+```
+ceph-17.2.5/src/msg/Messenger.h:723:30: error: ‘class ConfigValues’ has no member named ‘ms_die_on_unhandled_msg’
+```
+
+Add common-options-objs to common-msg-objs's depend to fix it.
+
+Full build log: https://fars.ee/YMqu
+Releated downstream issue: https://bugs.gentoo.org/866449
+Signed-off-by: jinqiang zhang <peeweep@0x0.ee>
+--- a/src/msg/CMakeLists.txt
++++ b/src/msg/CMakeLists.txt
+@@ -48,6 +48,7 @@ add_library(common-msg-objs OBJECT ${msg_srcs})
+ target_compile_definitions(common-msg-objs PRIVATE
+   $<TARGET_PROPERTY:fmt::fmt,INTERFACE_COMPILE_DEFINITIONS>)
+ target_include_directories(common-msg-objs PRIVATE ${OPENSSL_INCLUDE_DIR})
++add_dependencies(common-msg-objs common-options-objs)
+ 
+ if(WITH_DPDK)
+   set(async_dpdk_srcs
+
+From 80e422234acb1f8ffcbe8ee3898cb00f889466a3 Mon Sep 17 00:00:00 2001
+From: jinqiang zhang <peeweep@0x0.ee>
+Date: Tue, 20 Dec 2022 04:36:56 +0000
+Subject: [PATCH 2/2] cmake: fix krbd and rados_snap_set_diff_obj can't find
+ global_legacy_options.h
+
+compile ceph-17.2.5 failed with follow error messages:
+
+1. src/librados/snap_set_diff.cc can't find global_legacy_options.h
+```
+                 from /var/tmp/portage/sys-cluster/ceph-17.2.5-r1/work/ceph-17.2.5/src/librados/snap_set_diff.cc:7:
+/var/tmp/portage/sys-cluster/ceph-17.2.5-r1/work/ceph-17.2.5/src/common/options/legacy_config_opts.h:1:10: fatal error: global_legacy_options.h: No such file or directory
+
+```
+
+2. src/krbd.cc can't find global_legacy_options.h
+
+```
+                 from /var/tmp/portage/sys-cluster/ceph-17.2.5-r1/work/ceph-17.2.5/src/krbd.cc:44:
+/var/tmp/portage/sys-cluster/ceph-17.2.5-r1/work/ceph-17.2.5/src/common/options/legacy_config_opts.h:1:10: fatal error: global_legacy_options.h: No such file or directory
+
+```
+
+Add common-options-objs to depend to let it build ealier, similar with 3b3da64d.
+
+Full build log: https://fars.ee/SZFs
+Releated downstream issue: https://bugs.gentoo.org/868891
+Signed-off-by: jinqiang zhang <peeweep@0x0.ee>
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -614,6 +614,7 @@ add_subdirectory(osdc)
+ add_subdirectory(perfglue)
+ 
+ add_library(rados_snap_set_diff_obj OBJECT librados/snap_set_diff.cc)
++add_dependencies(rados_snap_set_diff_obj common-options-objs)
+ 
+ option(WITH_LIBRADOSSTRIPER "build with libradosstriper support" ON)
+ 
+@@ -867,6 +868,7 @@ add_subdirectory(journal)
+ if(WITH_RBD)
+   if(WITH_KRBD)
+     add_library(krbd STATIC krbd.cc
++      $<TARGET_OBJECTS:common-options-objs>
+       $<TARGET_OBJECTS:parse_secret_objs>)
+     target_link_libraries(krbd keyutils::keyutils)
+   endif()
+