diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /sys-cluster/ceph/files | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'sys-cluster/ceph/files')
13 files changed, 15 insertions, 436 deletions
diff --git a/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch b/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch deleted file mode 100644 index 0f02e6e6d433..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.0-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/modules/Distutils.cmake b/cmake/modules/Distutils.cmake -index 24d1a50654..a9fac61196 100644 ---- a/cmake/modules/Distutils.cmake -+++ b/cmake/modules/Distutils.cmake -@@ -43,7 +43,7 @@ function(distutils_add_cython_module name src) - CC=${PY_CC} - CXX=${PY_CXX} - LDSHARED=${PY_LDSHARED} -- OPT=\"-DNDEBUG -g -fwrapv -O2 -w\" -+ OPT=\"-DNDEBUG -fwrapv -w\" - LDFLAGS=-L${CMAKE_LIBRARY_OUTPUT_DIRECTORY} - CYTHON_BUILD_DIR=${CMAKE_CURRENT_BINARY_DIR} - CEPH_LIBDIR=${CMAKE_LIBRARY_OUTPUT_DIRECTORY} diff --git a/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch b/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch deleted file mode 100644 index 28d1a02d711b..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.1-systemd-unitdir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt -index 3b03b6e613..c359ad2df9 100644 ---- a/systemd/CMakeLists.txt -+++ b/systemd/CMakeLists.txt -@@ -17,4 +17,4 @@ install(FILES - ceph-disk@.service - ceph-volume@.service - rbdmap.service -- DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/systemd/system) -+ DESTINATION ${SYSTEMD_UNITDIR}) diff --git a/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch b/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch deleted file mode 100644 index bd17686bd9a4..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch +++ /dev/null @@ -1,214 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5403de8f4c..ee3336ee27 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -563,7 +563,7 @@ set(BOOST_COMPONENTS - set(BOOST_HEADER_COMPONENTS container) - - if(WITH_MGR) -- list(APPEND BOOST_COMPONENTS python) -+ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION}) - endif() - if(WITH_BOOST_CONTEXT) - list(APPEND BOOST_COMPONENTS context coroutine) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b0837ab1d9..e12cecf354 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -623,13 +623,13 @@ set(ceph_common_objs - $<TARGET_OBJECTS:crush_objs>) - set(ceph_common_deps - json_spirit erasure_code rt ${LIB_RESOLV} -- Boost::thread -- Boost::system -- Boost::regex -- Boost::random -- Boost::program_options -- Boost::date_time -- Boost::iostreams -+ boost_thread -+ boost_system -+ boost_regex -+ boost_random -+ boost_program_options -+ boost_date_time -+ boost_iostreams - ${BLKID_LIBRARIES} - ${Backtrace_LIBRARIES} - ${BLKIN_LIBRARIES} -@@ -727,7 +727,7 @@ if (WITH_MGR) - $<TARGET_OBJECTS:heap_profiler_objs>) - target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}") - target_link_libraries(ceph-mgr osdc client global-static common -- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) -+ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) - install(TARGETS ceph-mgr DESTINATION bin) - endif (WITH_MGR) - -@@ -901,7 +901,7 @@ set(ceph_mds_srcs - ceph_mds.cc) - add_executable(ceph-mds ${ceph_mds_srcs}) - target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common -- Boost::thread) -+ boost_thread) - install(TARGETS ceph-mds DESTINATION bin) - - add_subdirectory(erasure-code) -diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt -index 57cb2a5b94..971af8ebec 100644 ---- a/src/rgw/CMakeLists.txt -+++ b/src/rgw/CMakeLists.txt -@@ -156,7 +156,7 @@ if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPE - endif() - if (WITH_RADOSGW_BEAST_FRONTEND) - target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING) -- target_link_libraries(rgw_a Boost::coroutine Boost::context) -+ target_link_libraries(rgw_a boost_coroutine boost_context) - endif() - - set(radosgw_srcs -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 66e24b8bc9..0f659c98e2 100644 ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -145,7 +145,7 @@ add_executable(ceph_omapbench - ) - target_link_libraries(ceph_omapbench - librados -- Boost::program_options -+ boost_program_options - global - ${BLKID_LIBRARIES} - ${CMAKE_DL_LIBS} -@@ -199,7 +199,7 @@ if(${WITH_RADOSGW}) - cls_rgw_client - cls_user_client - cls_lock_client -- Boost::regex -+ boost_regex - ${BLKID_LIBRARIES} - ${CURL_LIBRARIES} - ${EXPAT_LIBRARIES} -@@ -229,7 +229,7 @@ if(${WITH_RADOSGW}) - cls_rgw_client - cls_user_client - cls_lock_client -- Boost::regex -+ boost_regex - ${BLKID_LIBRARIES} - ${CURL_LIBRARIES} - ${EXPAT_LIBRARIES} -diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt -index 9fba701e05..da3cbcfe96 100644 ---- a/src/test/bench/CMakeLists.txt -+++ b/src/test/bench/CMakeLists.txt -@@ -8,7 +8,7 @@ set(smalliobench_srcs - add_executable(ceph_smalliobench - ${smalliobench_srcs} - ) --target_link_libraries(ceph_smalliobench librados Boost::program_options global -+target_link_libraries(ceph_smalliobench librados boost_program_options global - ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) - - # ceph_smalliobenchrbd -@@ -27,7 +27,7 @@ if(WITH_RBD) - librados - os - global -- Boost::program_options -+ boost_program_options - ${BLKID_LIBRARIES} - ${CMAKE_DL_LIBS} - ) -@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs - add_executable(ceph_smalliobenchfs - ${ceph_smalliobenchfs_srcs} - ) --target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global -+target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global - ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) - - # ceph_smalliobenchdumb -@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs - add_executable(ceph_smalliobenchdumb - ${smalliobenchdumb_srcs} - ) --target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global -+target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global - ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) - - # ceph_tpbench -@@ -73,7 +73,7 @@ set(tpbench_srcs - add_executable(ceph_tpbench - ${tpbench_srcs} - ) --target_link_libraries(ceph_tpbench librados Boost::program_options global -+target_link_libraries(ceph_tpbench librados boost_program_options global - ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) - - install(TARGETS -diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt -index dc4e0865d0..69502342bb 100644 ---- a/src/test/erasure-code/CMakeLists.txt -+++ b/src/test/erasure-code/CMakeLists.txt -@@ -2,15 +2,15 @@ - add_executable(ceph_erasure_code_benchmark - ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc - ceph_erasure_code_benchmark.cc) --target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - install(TARGETS ceph_erasure_code_benchmark - DESTINATION bin) - - add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) --target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - - add_executable(ceph_erasure_code ceph_erasure_code.cc) --target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - install(TARGETS ceph_erasure_code - DESTINATION bin) - -diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt -index c35ddb3d8f..3916544259 100644 ---- a/src/test/librados/CMakeLists.txt -+++ b/src/test/librados/CMakeLists.txt -@@ -137,7 +137,7 @@ add_executable(ceph_test_rados_api_tier - set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS - ${UNITTEST_CXX_FLAGS}) - target_link_libraries(ceph_test_rados_api_tier -- global rados_a ${UNITTEST_LIBS} Boost::system radostest) -+ global rados_a ${UNITTEST_LIBS} boost_system radostest) - - # ceph_test_rados_api_snapshots - add_executable(ceph_test_rados_api_snapshots -diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt -index 9f72fa3b48..665c977606 100644 ---- a/src/tools/CMakeLists.txt -+++ b/src/tools/CMakeLists.txt -@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global) - install(TARGETS ceph_radosacl DESTINATION bin) - - add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) --target_link_libraries(ceph-osdomap-tool os global Boost::program_options) -+target_link_libraries(ceph-osdomap-tool os global boost_program_options) - install(TARGETS ceph-osdomap-tool DESTINATION bin) - - add_executable(ceph-monstore-tool - ceph_monstore_tool.cc - ../mgr/mgr_commands.cc) --target_link_libraries(ceph-monstore-tool os global Boost::program_options) -+target_link_libraries(ceph-monstore-tool os global boost_program_options) - install(TARGETS ceph-monstore-tool DESTINATION bin) - install(PROGRAMS - ceph-monstore-update-crush.sh -@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool - ceph_objectstore_tool.cc - rebuild_mondb.cc - RadosDump.cc) --target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) - if(WITH_FUSE) - target_link_libraries(ceph-objectstore-tool fuse) - endif(WITH_FUSE) diff --git a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch b/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch deleted file mode 100644 index cd9eb4891cb5..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.11-fix-min-call.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc -index 0074c7964b..98991be7d2 100644 ---- a/src/osd/PrimaryLogPG.cc -+++ b/src/osd/PrimaryLogPG.cc -@@ -1582,7 +1582,7 @@ void PrimaryLogPG::calc_trim_to() - if (limit != eversion_t() && - limit != pg_trim_to && - pg_log.get_log().approx_size() > target) { -- size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target, -+ size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() - target), - cct->_conf->osd_pg_log_trim_max); - if (num_to_trim < cct->_conf->osd_pg_log_trim_min && - cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) { diff --git a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch b/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch deleted file mode 100644 index a21bcc9325d8..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.12-civetweb-openssl-1.1.1.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/civetweb/src/civetweb.c 2017-11-02 10:58:06.000000000 -0700 -+++ b/src/civetweb/src/civetweb.c 2019-04-11 17:23:30.736346783 -0700 -@@ -851,6 +851,7 @@ - #include <openssl/crypto.h> - #include <openssl/x509.h> - #include <openssl/pem.h> -+#include <openssl/engine.h> - #else - /* SSL loaded dynamically from DLL. - * I put the prototypes here to be independent from OpenSSL source diff --git a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch b/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch deleted file mode 100644 index 9a23e1ee60a4..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.12-dont-use-bad-namespace.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/rgw/rgw_crypt.cc b/src/rgw/rgw_crypt.cc -index cf4e38995e..7a4089fca9 100644 ---- a/src/rgw/rgw_crypt.cc -+++ b/src/rgw/rgw_crypt.cc -@@ -31,7 +31,7 @@ using namespace CryptoPP; - #define dout_subsys ceph_subsys_rgw - - using namespace rgw; --using ceph::crypto::PK11_ImportSymKey_FIPS; -+//using ceph::crypto::PK11_ImportSymKey_FIPS; - - /** - * Encryption in CTR mode. offset is used as IV for each block. diff --git a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch b/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch deleted file mode 100644 index 1b72e5447dbe..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.12-ncurses-tinfo.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt -index 7aa42e9efd..66186b159f 100644 ---- a/src/tools/rbd/CMakeLists.txt -+++ b/src/tools/rbd/CMakeLists.txt -@@ -1,3 +1,6 @@ -+set(CURSES_NEED_NCURSES TRUE) -+find_package(Curses REQUIRED) -+ - set(rbd_srcs - rbd.cc - ArgumentTypes.cc -@@ -46,7 +49,7 @@ target_link_libraries(rbd librbd librados - cls_journal_client cls_rbd_client - rbd_types - journal -- ceph-common global -+ ceph-common global ${CURSES_LIBRARIES} - ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) - if(WITH_KRBD) - target_link_libraries(rbd diff --git a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch b/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch deleted file mode 100644 index 1b63d6e21ba5..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.12-qa-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc -index d95a397a84..d2cbf4b7b9 100644 ---- a/src/common/blkdev.cc -+++ b/src/common/blkdev.cc -@@ -225,7 +225,7 @@ int get_device_by_uuid(uuid_d dev_uuid, const char* label, char* partition, - rc = get_block_device_base(partition, basename, - sizeof(basename)); - if (rc >= 0) { -- strncpy(device, basename, sizeof(basename)); -+ strncpy(device, basename, sizeof(device)); - rc = 0; - } else { - rc = -ENODEV; diff --git a/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch b/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch deleted file mode 100644 index 3535d8cf4369..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.4-cflags.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake -index c7cd39a110..e7b8115485 100644 ---- a/cmake/modules/BuildBoost.cmake -+++ b/cmake/modules/BuildBoost.cmake -@@ -29,7 +29,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}") - - string(REPLACE ";" "," boost_with_libs "${Boost_BUILD_COMPONENTS}") -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7aa8a4392e..c7543a62bd 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -808,6 +808,7 @@ install(TARGETS ceph-mon DESTINATION bin) - - if (NOT WITH_SYSTEM_ROCKSDB) - set(ROCKSDB_CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON) -+ list(APPEND ROCKSDB_CMAKE_ARGS -DDISABLE_WARNING_AS_ERROR=ON) - - if(ALLOCATOR STREQUAL "jemalloc") - list(APPEND ROCKSDB_CMAKE_ARGS -DWITH_JEMALLOC=ON) -diff --git a/src/compressor/zstd/CMakeLists.txt b/src/compressor/zstd/CMakeLists.txt -index d9d2b6e560..1b2099fcbd 100644 ---- a/src/compressor/zstd/CMakeLists.txt -+++ b/src/compressor/zstd/CMakeLists.txt -@@ -1,7 +1,7 @@ - # zstd - - # libzstd - build it statically --set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable -O3) -+set(ZSTD_C_FLAGS -fPIC -Wno-unused-variable $ENV{CFLAGS}) - - include(ExternalProject) - ExternalProject_Add(zstd_ext diff --git a/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch b/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch deleted file mode 100644 index d744318cd111..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.4-rocksdb-cflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ceph-12.2.4.orig/src/rocksdb/CMakeLists.txt 2018-03-05 19:06:21.016923872 -0800 -+++ ceph-12.2.4/src/rocksdb/CMakeLists.txt 2018-03-05 19:09:01.798721666 -0800 -@@ -147,7 +147,7 @@ - endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fno-omit-frame-pointer") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer") - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("-momit-leaf-frame-pointer" HAVE_OMIT_LEAF_FRAME_POINTER) - if(HAVE_OMIT_LEAF_FRAME_POINTER) diff --git a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch b/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch deleted file mode 100644 index dd24e7819fe0..000000000000 --- a/sys-cluster/ceph/files/ceph-12.2.5-no-werror.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ur ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt ceph-12.2.5/src/rapidjson/CMakeLists.txt ---- ceph-12.2.5.orig/src/rapidjson/CMakeLists.txt 2018-07-09 11:18:09.188115751 -0700 -+++ ceph-12.2.5/src/rapidjson/CMakeLists.txt 2018-07-09 11:36:56.848639110 -0700 -@@ -50,7 +50,7 @@ - endif(CCACHE_FOUND) - - if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra") - if (RAPIDJSON_BUILD_CXX11) - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -@@ -73,7 +73,7 @@ - endif() - endif() - elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Werror -Wno-missing-field-initializers") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra -Wno-missing-field-initializers") - if (RAPIDJSON_BUILD_CXX11) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - endif() -diff -ur ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt ceph-12.2.5/src/rocksdb/CMakeLists.txt ---- ceph-12.2.5.orig/src/rocksdb/CMakeLists.txt 2018-07-09 11:18:09.219115543 -0700 -+++ ceph-12.2.5/src/rocksdb/CMakeLists.txt 2018-07-09 11:34:58.843411195 -0700 -@@ -174,15 +174,6 @@ - PROPERTIES COMPILE_FLAGS "-msse4.2") - endif() - --option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON) --if(FAIL_ON_WARNINGS) -- if(MSVC) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") -- else() # assume GCC -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") -- endif() --endif() -- - option(WITH_ASAN "build with ASAN" OFF) - if(WITH_ASAN) - add_definitions(-DROCKSDB_TSAN_RUN) -diff -ur ceph-12.2.5.orig/src/rocksdb/Makefile ceph-12.2.5/src/rocksdb/Makefile ---- ceph-12.2.5.orig/src/rocksdb/Makefile 2018-03-11 18:58:51.000000000 -0700 -+++ ceph-12.2.5/src/rocksdb/Makefile 2018-07-09 11:35:53.847049123 -0700 -@@ -243,11 +243,6 @@ - WARNING_FLAGS = -W -Wextra -Wall -Wsign-compare -Wshadow \ - -Wno-unused-parameter - --ifndef DISABLE_WARNING_AS_ERROR -- WARNING_FLAGS += -Werror --endif -- -- - ifdef LUA_PATH - - ifndef LUA_INCLUDE diff --git a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch b/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch deleted file mode 100644 index aaa6ee080a33..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.10-missing-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/common/bit_str.h b/src/common/bit_str.h -index c4c24f6a75..b5631e8b84 100644 ---- a/src/common/bit_str.h -+++ b/src/common/bit_str.h -@@ -14,6 +14,8 @@ - #ifndef CEPH_COMMON_BIT_STR_H - #define CEPH_COMMON_BIT_STR_H - -+#include <cstdint> -+#include <iosfwd> - #include <functional> - - namespace ceph { -diff --git a/src/librbd/api/PoolMetadata.h b/src/librbd/api/PoolMetadata.h -index 977ce3638d..8d982879aa 100644 ---- a/src/librbd/api/PoolMetadata.h -+++ b/src/librbd/api/PoolMetadata.h -@@ -8,6 +8,8 @@ - #include "include/rados/librados_fwd.hpp" - - #include <map> -+#include <string> -+#include <cstdint> - - namespace librbd { - diff --git a/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch new file mode 100644 index 000000000000..f8f7fad8b658 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-15.2.5-glibc-2.32.patch @@ -0,0 +1,15 @@ +diff -NaurBwdp a/src/global/signal_handler.h src/global/b/signal_handler.h
+--- a/src/global/signal_handler.h 2020-10-01 03:15:48.208164979 +0700
++++ b/src/global/signal_handler.h 2020-10-01 03:15:40.655244081 +0700
+@@ -20,11 +20,7 @@
+
+ typedef void (*signal_handler_t)(int);
+
+-#ifndef HAVE_REENTRANT_STRSIGNAL
+-# define sig_str(signum) sys_siglist[signum]
+-#else
+ # define sig_str(signum) strsignal(signum)
+-#endif
+
+ void install_sighandler(int signum, signal_handler_t handler, int flags);
+
|