commit: ecb97058c4f5413a5649499400b2dfcfcb825039
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec 3 19:34:04 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Dec 5 14:59:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecb97058
sys-cluster/ceph: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
sys-cluster/ceph/files/ceph-16.2.0-liburing.patch | 35 -----------
sys-cluster/ceph/files/ceph-16.2.2-cflags.patch | 13 ----
.../ceph/files/ceph-17.2.0-cyclic-deps.patch | 24 --------
.../ceph/files/ceph-17.2.0-deprecated-boost.patch | 69 ----------------------
sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch | 13 ----
.../ceph/files/ceph-17.2.0-install-dbstore.patch | 12 ----
.../files/ceph-17.2.0-system-opentelemetry.patch | 20 -------
.../ceph/files/ceph-17.2.4-cyclic-deps.patch | 13 ----
sys-cluster/ceph/files/ceph-17.2.7-fmt-fixes.patch | 12 ----
9 files changed, 211 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch
b/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch
deleted file mode 100644
index dd248d51ac61..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.0-liburing.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/cmake/modules/Finduring.cmake b/cmake/modules/Finduring.cmake
-index 10c8de4255..c0a4dadfe4 100644
---- a/cmake/modules/Finduring.cmake
-+++ b/cmake/modules/Finduring.cmake
-@@ -8,10 +8,10 @@ find_path(URING_INCLUDE_DIR liburing.h)
- find_library(URING_LIBRARIES liburing.a liburing)
-
- include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(uring DEFAULT_MSG URING_LIBRARIES
URING_INCLUDE_DIR)
-+pkg_check_modules(URING REQUIRED liburing)
-
- if(uring_FOUND AND NOT TARGET uring::uring)
-- add_library(uring::uring UNKNOWN IMPORTED)
-+ add_library(uring::uring ALIAS ${URING_LIBRARIES})
- set_target_properties(uring::uring PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "${URING_INCLUDE_DIR}"
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-diff --git a/src/blk/CMakeLists.txt b/src/blk/CMakeLists.txt
-index dc4f9b82ae..e39d690394 100644
---- a/src/blk/CMakeLists.txt
-+++ b/src/blk/CMakeLists.txt
-@@ -52,10 +52,11 @@ endif()
-
- if(WITH_LIBURING)
- if(WITH_SYSTEM_LIBURING)
-- find_package(uring REQUIRED)
-+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}../../cmake/modules/")
-+ pkg_check_modules(URING REQUIRED liburing)
- else()
- include(Builduring)
- build_uring()
- endif()
-- target_link_libraries(blk PRIVATE uring::uring)
-+ target_link_libraries(blk PRIVATE ${URING_LIBRARIES})
- endif()
diff --git a/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch
b/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch
deleted file mode 100644
index 8c7bb79803c8..000000000000
--- a/sys-cluster/ceph/files/ceph-16.2.2-cflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
-index ba86ecaa63..b969c42911 100644
---- a/cmake/modules/BuildBoost.cmake
-+++ b/cmake/modules/BuildBoost.cmake
-@@ -62,7 +62,7 @@ function(do_build_boost version)
- else()
- list(APPEND boost_features "address-model=32")
- endif()
-- set(BOOST_CXXFLAGS "-fPIC -w") # check on arm, etc <---XXX
-+ set(BOOST_CXXFLAGS "${CMAKE_CXX_FLAGS} -fPIC -w") # check on arm, etc
<---XXX
- list(APPEND boost_features "cxxflags=${BOOST_CXXFLAGS}")
-
- set(boost_with_libs)
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch
b/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch
deleted file mode 100644
index e9177cc02764..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.0-cyclic-deps.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/rgw/store/dbstore/CMakeLists.txt
b/src/rgw/store/dbstore/CMakeLists.txt
-index 143ede3c094c9..18e032b73f54f 100644
---- a/src/rgw/store/dbstore/CMakeLists.txt
-+++ b/src/rgw/store/dbstore/CMakeLists.txt
-@@ -47,7 +47,7 @@ else()
- endif()
-
- include_directories(${CMAKE_INCLUDE_DIR})
--add_library(dbstore ${dbstore_mgr_srcs})
-+add_library(dbstore STATIC ${dbstore_mgr_srcs})
- target_link_libraries(dbstore ${CMAKE_LINK_LIBRARIES})
-
- # testing purpose
-diff --git a/src/rgw/store/dbstore/sqlite/CMakeLists.txt
b/src/rgw/store/dbstore/sqlite/CMakeLists.txt
-index cce59b9ec0aa9..909765e3058b6 100644
---- a/src/rgw/store/dbstore/sqlite/CMakeLists.txt
-+++ b/src/rgw/store/dbstore/sqlite/CMakeLists.txt
-@@ -12,5 +12,5 @@ include_directories(${CMAKE_INCLUDE_DIR})
- set(SQLITE_COMPILE_FLAGS "-DSQLITE_THREADSAFE=1")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SQLITE_COMPILE_FLAGS}")
-
--add_library(sqlite_db ${sqlite_db_srcs})
-+add_library(sqlite_db STATIC ${sqlite_db_srcs})
- target_link_libraries(sqlite_db sqlite3 dbstore_lib rgw_common)
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch
b/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch
deleted file mode 100644
index 64b6d5c614c8..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.0-deprecated-boost.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/src/common/ConfUtils.cc b/src/common/ConfUtils.cc
-index ad791ece4f7..2f78fd02bf9 100644
---- a/src/common/ConfUtils.cc
-+++ b/src/common/ConfUtils.cc
-@@ -26,7 +26,7 @@
- #include <boost/algorithm/string.hpp>
- #include <boost/algorithm/string/trim_all.hpp>
- #include <boost/spirit/include/qi.hpp>
--#include <boost/spirit/include/phoenix.hpp>
-+#include <boost/phoenix.hpp>
- #include <boost/spirit/include/support_line_pos_iterator.hpp>
-
- #include "include/buffer.h"
-diff --git a/src/mds/MDSAuthCaps.cc b/src/mds/MDSAuthCaps.cc
-index b78ebd6615b..f8158be6866 100644
---- a/src/mds/MDSAuthCaps.cc
-+++ b/src/mds/MDSAuthCaps.cc
-@@ -17,8 +17,8 @@
- #include <errno.h>
-
- #include <boost/spirit/include/qi.hpp>
--#include <boost/spirit/include/phoenix_operator.hpp>
--#include <boost/spirit/include/phoenix.hpp>
-+#include <boost/phoenix/operator.hpp>
-+#include <boost/phoenix.hpp>
-
- #include "common/debug.h"
- #include "MDSAuthCaps.h"
-diff --git a/src/mgr/MgrCap.cc b/src/mgr/MgrCap.cc
-index cba758083c3..6e5e1f9bb99 100644
---- a/src/mgr/MgrCap.cc
-+++ b/src/mgr/MgrCap.cc
-@@ -16,7 +16,7 @@
- #include <boost/spirit/include/qi_uint.hpp>
- #include <boost/spirit/include/qi.hpp>
- #include <boost/fusion/include/std_pair.hpp>
--#include <boost/spirit/include/phoenix.hpp>
-+#include <boost/phoenix.hpp>
- #include <boost/fusion/adapted/struct/adapt_struct.hpp>
- #include <boost/fusion/include/adapt_struct.hpp>
- #include <boost/algorithm/string/predicate.hpp>
-diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc
-index e1dc3723965..0ff9fefdd15 100644
---- a/src/mon/MonCap.cc
-+++ b/src/mon/MonCap.cc
-@@ -16,7 +16,7 @@
- #include <boost/spirit/include/qi_uint.hpp>
- #include <boost/spirit/include/qi.hpp>
- #include <boost/fusion/include/std_pair.hpp>
--#include <boost/spirit/include/phoenix.hpp>
-+#include <boost/phoenix.hpp>
- #include <boost/fusion/adapted/struct/adapt_struct.hpp>
- #include <boost/fusion/include/adapt_struct.hpp>
- #include <boost/algorithm/string/predicate.hpp>
-diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc
-index e7bf0582799..f847e80e337 100644
---- a/src/osd/OSDCap.cc
-+++ b/src/osd/OSDCap.cc
-@@ -14,8 +14,8 @@
-
- #include <boost/config/warning_disable.hpp>
- #include <boost/spirit/include/qi.hpp>
--#include <boost/spirit/include/phoenix_operator.hpp>
--#include <boost/spirit/include/phoenix.hpp>
-+#include <boost/phoenix/operator.hpp>
-+#include <boost/phoenix.hpp>
- #include <boost/algorithm/string/predicate.hpp>
-
- #include "OSDCap.h"
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch
b/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch
deleted file mode 100644
index 59b2be6ffd80..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.0-fuse3.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e95019cedb2..814c7f4d0b7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -178,7 +178,7 @@ endif()
-
- option(WITH_FUSE "Fuse is here" ON)
- if(WITH_FUSE)
-- find_package(FUSE)
-+ find_package(FUSE 3.0)
- set(HAVE_LIBFUSE ${FUSE_FOUND})
- endif()
-
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch
b/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch
deleted file mode 100644
index e50030071c81..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.0-install-dbstore.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/rgw/store/dbstore/CMakeLists.txt
b/src/rgw/store/dbstore/CMakeLists.txt
-index 143ede3c094..204ef653010 100644
---- a/src/rgw/store/dbstore/CMakeLists.txt
-+++ b/src/rgw/store/dbstore/CMakeLists.txt
-@@ -24,6 +24,7 @@ if(WITH_JAEGER)
- list(APPEND link_targets ${jaeger_base})
- endif()
- target_link_libraries(dbstore_lib PUBLIC ${link_targets})
-+install(TARGETS dbstore_lib DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
- set (CMAKE_LINK_LIBRARIES ${CMAKE_LINK_LIBRARIES} dbstore_lib)
-
diff --git a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
b/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
deleted file mode 100644
index 1b4e614bb517..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.0-system-opentelemetry.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 30cf3605468..902e2123d04 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -430,9 +430,12 @@ add_dependencies(common-objs legacy-option-headers)
-
- if(WITH_JAEGER)
- find_package(thrift 0.13.0 REQUIRED)
-- include(BuildOpentelemetry)
-- build_opentelemetry()
-- set(jaeger_base opentelemetry::libopentelemetry thrift::libthrift)
-+ find_package(opentelemetry-cpp REQUIRED)
-+ set(jaeger_base
-+ opentelemetry-cpp::common
-+ opentelemetry-cpp::trace
-+ opentelemetry-cpp::jaeger_trace_exporter
-+ thrift::libthrift)
- add_dependencies(common-objs ${jaeger_base})
- target_link_libraries(common-objs ${jaeger_base})
- endif()
diff --git a/sys-cluster/ceph/files/ceph-17.2.4-cyclic-deps.patch
b/sys-cluster/ceph/files/ceph-17.2.4-cyclic-deps.patch
deleted file mode 100644
index 6040906a3f19..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.4-cyclic-deps.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/rgw/store/dbstore/CMakeLists.txt
b/src/rgw/store/dbstore/CMakeLists.txt
-index 1feac6dcee0..586d0dbb961 100644
---- a/src/rgw/store/dbstore/CMakeLists.txt
-+++ b/src/rgw/store/dbstore/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(dbstore_mgr_srcs
- dbstore_mgr.cc
- )
-
--add_library(dbstore_lib ${dbstore_srcs})
-+ add_library(dbstore_lib STATIC ${dbstore_srcs})
- target_include_directories(dbstore_lib PUBLIC
"${CMAKE_SOURCE_DIR}/src/fmt/include")
- target_include_directories(dbstore_lib PUBLIC "${CMAKE_SOURCE_DIR}/src/rgw")
- set(link_targets spawn)
diff --git a/sys-cluster/ceph/files/ceph-17.2.7-fmt-fixes.patch
b/sys-cluster/ceph/files/ceph-17.2.7-fmt-fixes.patch
deleted file mode 100644
index 5d8ee2af9ba3..000000000000
--- a/sys-cluster/ceph/files/ceph-17.2.7-fmt-fixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/osd/SnapMapper.cc b/src/osd/SnapMapper.cc
-index 4feabcda459..6b9a9bf86ce 100644
---- a/src/osd/SnapMapper.cc
-+++ b/src/osd/SnapMapper.cc
-@@ -17,6 +17,7 @@
- #include <fmt/printf.h>
- #include <fmt/ranges.h>
-
-+#include "include/object_fmt.h"
- #include "osd/osd_types_fmt.h"
- #include "SnapMapReaderI.h"
-
