Merged update to 16.2.9 from master

[packages/ceph.git] / ceph-tcmalloc.patch

diff --git a/ceph-tcmalloc.patch b/ceph-tcmalloc.patch
deleted file mode 100644 (file)
index 7d196dd..0000000
--- a/ceph-tcmalloc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ceph-14.2.22/cmake/modules/Findgperftools.cmake.orig       2020-01-30 21:52:36.000000000 +0100
-+++ ceph-14.2.22/cmake/modules/Findgperftools.cmake    2020-05-28 17:05:49.948032294 +0200
-@@ -31,7 +31,7 @@ if(Tcmalloc_INCLUDE_DIR AND EXISTS "${Tc
-   endif()
- endif()
- 
--foreach(component tcmalloc tcmalloc_minimal profiler)
-+foreach(component tcmalloc tcmalloc_minimal)
-   string(TOUPPER ${component} COMPONENT)
-   find_library(GPERFTOOLS_${COMPONENT}_LIBRARY ${component}
-     HINTS $ENV{GPERF_ROOT}/lib)
-@@ -54,7 +54,7 @@ find_package_handle_standard_args(gperft
-   REQUIRED_VARS ${_gperftools_FIND_REQUIRED_VARS}
-   VERSION_VAR TCMALLOC_VERSION_STRING)
- 
--mark_as_advanced(${GPERFTOOLS_LIBRARIES} GPERFTOOLS_INCLUDE_DIR)
-+mark_as_advanced(${GPERFTOOLS_LIBRARIES} GPERFTOOLS_INCLUDE_DIR Tcmalloc_INCLUDE_DIR)
- 
- if(gperftools_FOUND)
-   foreach(component tcmalloc tcmalloc_minimal profiler)