1 |
commit: 8fdd0419a4c6fdcc82a4342601aaa7e7061220c7 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jun 27 17:38:25 2020 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 27 20:47:54 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fdd0419 |
7 |
|
8 |
sys-cluster/ceph: remove unused patches |
9 |
|
10 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/16451 |
13 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
14 |
|
15 |
.../ceph-14.2.5-boost-1.6-python-sonames.patch | 26 -- |
16 |
.../ceph/files/ceph-14.2.5-boost-sonames.patch | 471 --------------------- |
17 |
2 files changed, 497 deletions(-) |
18 |
|
19 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch |
20 |
deleted file mode 100644 |
21 |
index 318844f6c02..00000000000 |
22 |
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-1.6-python-sonames.patch |
23 |
+++ /dev/null |
24 |
@@ -1,26 +0,0 @@ |
25 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
26 |
-index 1e9ebfbb41..1a858a6e3f 100644 |
27 |
---- a/CMakeLists.txt |
28 |
-+++ b/CMakeLists.txt |
29 |
-@@ -649,7 +649,7 @@ set(BOOST_HEADER_COMPONENTS container) |
30 |
- |
31 |
- if(WITH_MGR) |
32 |
- list(APPEND BOOST_COMPONENTS |
33 |
-- python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}) |
34 |
-+ python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR}) |
35 |
- endif() |
36 |
- if(WITH_BOOST_CONTEXT) |
37 |
- list(APPEND BOOST_COMPONENTS context coroutine) |
38 |
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake |
39 |
-index f46cc0d485..3cc6340b2c 100644 |
40 |
---- a/cmake/modules/BuildBoost.cmake |
41 |
-+++ b/cmake/modules/BuildBoost.cmake |
42 |
-@@ -205,7 +205,7 @@ macro(build_boost version) |
43 |
- endif() |
44 |
- add_dependencies(Boost::${c} Boost) |
45 |
- if(c MATCHES "^python") |
46 |
-- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") |
47 |
-+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") |
48 |
- endif() |
49 |
- if(Boost_USE_STATIC_LIBS) |
50 |
- set(Boost_${upper_c}_LIBRARY |
51 |
|
52 |
diff --git a/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch |
53 |
deleted file mode 100644 |
54 |
index d8c26bcdfe2..00000000000 |
55 |
--- a/sys-cluster/ceph/files/ceph-14.2.5-boost-sonames.patch |
56 |
+++ /dev/null |
57 |
@@ -1,471 +0,0 @@ |
58 |
-diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake |
59 |
-index f46cc0d485..39bb081b1b 100644 |
60 |
---- a/cmake/modules/BuildBoost.cmake |
61 |
-+++ b/cmake/modules/BuildBoost.cmake |
62 |
-@@ -199,13 +199,13 @@ macro(build_boost version) |
63 |
- foreach(c ${Boost_BUILD_COMPONENTS}) |
64 |
- string(TOUPPER ${c} upper_c) |
65 |
- if(Boost_USE_STATIC_LIBS) |
66 |
-- add_library(Boost::${c} STATIC IMPORTED) |
67 |
-+ add_library(Boost_${c} STATIC IMPORTED) |
68 |
- else() |
69 |
-- add_library(Boost::${c} SHARED IMPORTED) |
70 |
-+ add_library(Boost_${c} SHARED IMPORTED) |
71 |
- endif() |
72 |
-- add_dependencies(Boost::${c} Boost) |
73 |
-+ add_dependencies(Boost_${c} Boost) |
74 |
- if(c MATCHES "^python") |
75 |
-- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") |
76 |
-+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") |
77 |
- endif() |
78 |
- if(Boost_USE_STATIC_LIBS) |
79 |
- set(Boost_${upper_c}_LIBRARY |
80 |
-@@ -215,7 +215,7 @@ macro(build_boost version) |
81 |
- ${install_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}boost_${c}${CMAKE_SHARED_LIBRARY_SUFFIX}) |
82 |
- endif() |
83 |
- unset(buildid) |
84 |
-- set_target_properties(Boost::${c} PROPERTIES |
85 |
-+ set_target_properties(Boost_${c} PROPERTIES |
86 |
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}" |
87 |
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" |
88 |
- IMPORTED_LOCATION "${Boost_${upper_c}_LIBRARY}") |
89 |
-@@ -224,19 +224,19 @@ macro(build_boost version) |
90 |
- foreach(c ${Boost_BUILD_COMPONENTS}) |
91 |
- if(Boost_${c}_DEPENDENCIES) |
92 |
- foreach(dep ${Boost_${c}_DEPENDENCIES}) |
93 |
-- list(APPEND dependencies Boost::${dep}) |
94 |
-+ list(APPEND dependencies Boost_${dep}) |
95 |
- endforeach() |
96 |
-- set_target_properties(Boost::${c} PROPERTIES |
97 |
-+ set_target_properties(Boost_${c} PROPERTIES |
98 |
- INTERFACE_LINK_LIBRARIES "${dependencies}") |
99 |
- unset(dependencies) |
100 |
- endif() |
101 |
- endforeach() |
102 |
- |
103 |
- # for header-only libraries |
104 |
-- add_library(Boost::boost INTERFACE IMPORTED) |
105 |
-- set_target_properties(Boost::boost PROPERTIES |
106 |
-+ add_library(Boost_boost INTERFACE IMPORTED) |
107 |
-+ set_target_properties(Boost_boost PROPERTIES |
108 |
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") |
109 |
-- add_dependencies(Boost::boost Boost) |
110 |
-+ add_dependencies(Boost_boost Boost) |
111 |
- find_package_handle_standard_args(Boost DEFAULT_MSG |
112 |
- Boost_INCLUDE_DIRS Boost_LIBRARIES) |
113 |
- mark_as_advanced(Boost_LIBRARIES BOOST_INCLUDE_DIRS) |
114 |
-@@ -253,7 +253,7 @@ function(maybe_add_boost_dep target) |
115 |
- get_filename_component(ext ${src} EXT) |
116 |
- # assuming all cxx source files include boost header(s) |
117 |
- if(ext MATCHES ".cc|.cpp|.cxx") |
118 |
-- add_dependencies(${target} Boost::boost) |
119 |
-+ add_dependencies(${target} Boost_boost) |
120 |
- return() |
121 |
- endif() |
122 |
- endforeach() |
123 |
-diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake |
124 |
-index e2525b8934..e728e5a9d2 100644 |
125 |
---- a/cmake/modules/FindBoost.cmake |
126 |
-+++ b/cmake/modules/FindBoost.cmake |
127 |
-@@ -340,10 +340,6 @@ macro(_Boost_ADJUST_LIB_VARS basename) |
128 |
- |
129 |
- if(Boost_${basename}_LIBRARY AND Boost_${basename}_HEADER) |
130 |
- set(Boost_${basename}_FOUND ON) |
131 |
-- if("x${basename}" STREQUAL "xTHREAD" AND NOT TARGET Threads::Threads) |
132 |
-- string(APPEND Boost_ERROR_REASON_THREAD " (missing dependency: Threads)") |
133 |
-- set(Boost_THREAD_FOUND OFF) |
134 |
-- endif() |
135 |
- endif() |
136 |
- |
137 |
- endif() |
138 |
-@@ -919,7 +915,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) |
139 |
- if (NOT _boost_DEPS_STRING) |
140 |
- set(_boost_DEPS_STRING "(none)") |
141 |
- endif() |
142 |
-- # message(STATUS "Dependencies for Boost::${component}: ${_boost_DEPS_STRING}") |
143 |
-+ # message(STATUS "Dependencies for Boost_${component}: ${_boost_DEPS_STRING}") |
144 |
- endfunction() |
145 |
- |
146 |
- # |
147 |
-@@ -1003,7 +999,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) |
148 |
- if (NOT _boost_HDRS_STRING) |
149 |
- set(_boost_HDRS_STRING "(none)") |
150 |
- endif() |
151 |
-- # message(STATUS "Headers for Boost::${component}: ${_boost_HDRS_STRING}") |
152 |
-+ # message(STATUS "Headers for Boost_${component}: ${_boost_HDRS_STRING}") |
153 |
- endfunction() |
154 |
- |
155 |
- # |
156 |
-@@ -1051,7 +1047,7 @@ endfunction() |
157 |
- |
158 |
- # |
159 |
- # Some boost libraries may require particular set of compler features. |
160 |
--# The very first one was `boost::fiber` introduced in Boost 1.62. |
161 |
-+# The very first one was `boost_fiber` introduced in Boost 1.62. |
162 |
- # One can check required compiler features of it in |
163 |
- # - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`; |
164 |
- # - `${Boost_ROOT}/libs/context/build/Jamfile.v2`. |
165 |
-@@ -1178,7 +1174,7 @@ else() |
166 |
- # _Boost_COMPONENT_HEADERS. See the instructions at the top of |
167 |
- # _Boost_COMPONENT_DEPENDENCIES. |
168 |
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} |
169 |
-- "1.70.0" "1.70" "1.69.0" "1.69" |
170 |
-+ "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" |
171 |
- "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" |
172 |
- "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" |
173 |
- "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" |
174 |
-@@ -1235,10 +1231,10 @@ endif() |
175 |
- # on all platforms to keep end user code free from platform dependent |
176 |
- # code. Also provide convenience targets to disable autolinking and |
177 |
- # enable dynamic linking. |
178 |
--if(NOT TARGET Boost::diagnostic_definitions) |
179 |
-- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) |
180 |
-- add_library(Boost::disable_autolinking INTERFACE IMPORTED) |
181 |
-- add_library(Boost::dynamic_linking INTERFACE IMPORTED) |
182 |
-+if(NOT TARGET boost_diagnostic_definitions) |
183 |
-+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED) |
184 |
-+ add_library(boost_disable_autolinking INTERFACE IMPORTED) |
185 |
-+ add_library(boost_dynamic_linking INTERFACE IMPORTED) |
186 |
- endif() |
187 |
- if(WIN32) |
188 |
- # In windows, automatic linking is performed, so you do not have |
189 |
-@@ -1259,11 +1255,11 @@ if(WIN32) |
190 |
- # code to emit a #pragma message each time a library is selected |
191 |
- # for linking. |
192 |
- set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC") |
193 |
-- set_target_properties(Boost::diagnostic_definitions PROPERTIES |
194 |
-+ set_target_properties(boost_diagnostic_definitions PROPERTIES |
195 |
- INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC") |
196 |
-- set_target_properties(Boost::disable_autolinking PROPERTIES |
197 |
-+ set_target_properties(boost_disable_autolinking PROPERTIES |
198 |
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") |
199 |
-- set_target_properties(Boost::dynamic_linking PROPERTIES |
200 |
-+ set_target_properties(boost_dynamic_linking PROPERTIES |
201 |
- INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") |
202 |
- endif() |
203 |
- |
204 |
-@@ -1738,7 +1734,7 @@ if("thread" IN_LIST Boost_FIND_COMPONENTS) |
205 |
- else() |
206 |
- set(_Boost_find_quiet "") |
207 |
- endif() |
208 |
-- find_package(Threads ${_Boost_find_quiet}) |
209 |
-+ find_package(boost_thread ${_Boost_find_quiet}) |
210 |
- unset(_Boost_find_quiet) |
211 |
- endif() |
212 |
- |
213 |
-@@ -2079,61 +2075,61 @@ endif() |
214 |
- |
215 |
- if(Boost_FOUND) |
216 |
- # For header-only libraries |
217 |
-- if(NOT TARGET Boost::boost) |
218 |
-- add_library(Boost::boost INTERFACE IMPORTED) |
219 |
-+ if(NOT TARGET Boost_boost) |
220 |
-+ add_library(Boost_boost INTERFACE IMPORTED) |
221 |
- if(Boost_INCLUDE_DIRS) |
222 |
-- set_target_properties(Boost::boost PROPERTIES |
223 |
-+ set_target_properties(Boost_boost PROPERTIES |
224 |
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") |
225 |
- endif() |
226 |
- endif() |
227 |
- |
228 |
- foreach(COMPONENT ${Boost_FIND_COMPONENTS}) |
229 |
-- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT}) |
230 |
-+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost_${COMPONENT}) |
231 |
- string(TOUPPER ${COMPONENT} UPPERCOMPONENT) |
232 |
- if(Boost_${UPPERCOMPONENT}_FOUND) |
233 |
- if(Boost_USE_STATIC_LIBS) |
234 |
-- add_library(Boost::${COMPONENT} STATIC IMPORTED) |
235 |
-+ add_library(Boost_${COMPONENT} STATIC IMPORTED) |
236 |
- else() |
237 |
- # Even if Boost_USE_STATIC_LIBS is OFF, we might have static |
238 |
- # libraries as a result. |
239 |
-- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED) |
240 |
-+ add_library(Boost_${COMPONENT} UNKNOWN IMPORTED) |
241 |
- endif() |
242 |
- if(Boost_INCLUDE_DIRS) |
243 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
244 |
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES |
245 |
- INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") |
246 |
- endif() |
247 |
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}") |
248 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
249 |
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES |
250 |
- IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" |
251 |
- IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}") |
252 |
- endif() |
253 |
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") |
254 |
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY |
255 |
-+ set_property(TARGET Boost_${COMPONENT} APPEND PROPERTY |
256 |
- IMPORTED_CONFIGURATIONS RELEASE) |
257 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
258 |
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES |
259 |
- IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" |
260 |
- IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") |
261 |
- endif() |
262 |
- if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") |
263 |
-- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY |
264 |
-+ set_property(TARGET Boost_${COMPONENT} APPEND PROPERTY |
265 |
- IMPORTED_CONFIGURATIONS DEBUG) |
266 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
267 |
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES |
268 |
- IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" |
269 |
- IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") |
270 |
- endif() |
271 |
- if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES) |
272 |
- unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES) |
273 |
- foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES}) |
274 |
-- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep}) |
275 |
-+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost_${dep}) |
276 |
- endforeach() |
277 |
- if(COMPONENT STREQUAL "thread") |
278 |
-- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads) |
279 |
-+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_thread) |
280 |
- endif() |
281 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
282 |
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES |
283 |
- INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}") |
284 |
- endif() |
285 |
- if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES) |
286 |
-- set_target_properties(Boost::${COMPONENT} PROPERTIES |
287 |
-+ set_target_properties(Boost_${COMPONENT} PROPERTIES |
288 |
- CXX_STANDARD 17) |
289 |
- endif() |
290 |
- endif() |
291 |
-diff --git a/cmake/modules/Finddpdk.cmake b/cmake/modules/Finddpdk.cmake |
292 |
-index 964ae5dfb0..92bf07c14e 100644 |
293 |
---- a/cmake/modules/Finddpdk.cmake |
294 |
-+++ b/cmake/modules/Finddpdk.cmake |
295 |
-@@ -102,9 +102,9 @@ if(dpdk_FOUND) |
296 |
- |
297 |
- if(NOT TARGET dpdk::dpdk) |
298 |
- add_library(dpdk::dpdk INTERFACE IMPORTED) |
299 |
-- find_package(Threads QUIET) |
300 |
-+ find_package(boost_thread QUIET) |
301 |
- list(APPEND dpdk_LIBRARIES |
302 |
-- Threads::Threads |
303 |
-+ boost_thread |
304 |
- dpdk::cflags) |
305 |
- set_target_properties(dpdk::dpdk PROPERTIES |
306 |
- INTERFACE_LINK_LIBRARIES "${dpdk_LIBRARIES}" |
307 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
308 |
-index 28ec9835f8..31a1efa19f 100644 |
309 |
---- a/src/CMakeLists.txt |
310 |
-+++ b/src/CMakeLists.txt |
311 |
-@@ -356,12 +356,12 @@ set(ceph_common_objs |
312 |
- set(ceph_common_deps |
313 |
- json_spirit erasure_code arch crc32 |
314 |
- ${LIB_RESOLV} |
315 |
-- Boost::thread |
316 |
-- Boost::system |
317 |
-- Boost::random |
318 |
-- Boost::program_options |
319 |
-- Boost::date_time |
320 |
-- Boost::iostreams |
321 |
-+ boost_thread |
322 |
-+ boost_system |
323 |
-+ boost_random |
324 |
-+ boost_program_options |
325 |
-+ boost_date_time |
326 |
-+ boost_iostreams |
327 |
- ${BLKID_LIBRARIES} |
328 |
- ${Backtrace_LIBRARIES} |
329 |
- ${BLKIN_LIBRARIES} |
330 |
-@@ -522,7 +522,7 @@ if (WITH_CEPHFS) |
331 |
- ceph_mds.cc) |
332 |
- add_executable(ceph-mds ${ceph_mds_srcs}) |
333 |
- target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common |
334 |
-- Boost::thread) |
335 |
-+ boost_thread) |
336 |
- install(TARGETS ceph-mds DESTINATION bin) |
337 |
- endif() |
338 |
- |
339 |
-diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt |
340 |
-index d7b58521d4..e1533af33f 100644 |
341 |
---- a/src/crimson/CMakeLists.txt |
342 |
-+++ b/src/crimson/CMakeLists.txt |
343 |
-@@ -106,8 +106,8 @@ target_link_libraries(crimson-common |
344 |
- PRIVATE |
345 |
- crc32 |
346 |
- crimson::cflags |
347 |
-- Boost::iostreams |
348 |
-- Boost::random |
349 |
-+ boost_iostreams |
350 |
-+ boost_random |
351 |
- ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto) |
352 |
- |
353 |
- set(crimson_auth_srcs |
354 |
-diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt |
355 |
-index 252fb3e5e3..213482da16 100644 |
356 |
---- a/src/mgr/CMakeLists.txt |
357 |
-+++ b/src/mgr/CMakeLists.txt |
358 |
-@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") |
359 |
- target_link_libraries(ceph-mgr |
360 |
- osdc client heap_profiler |
361 |
- global-static ceph-common |
362 |
-- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} |
363 |
-+ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} |
364 |
- ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) |
365 |
- set_target_properties(ceph-mgr PROPERTIES |
366 |
- POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) |
367 |
-diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt |
368 |
-index e9d3804c5f..5c6eb58de1 100644 |
369 |
---- a/src/rbd_replay/CMakeLists.txt |
370 |
-+++ b/src/rbd_replay/CMakeLists.txt |
371 |
-@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) |
372 |
- global |
373 |
- babeltrace |
374 |
- babeltrace-ctf |
375 |
-- Boost::date_time |
376 |
-+ boost_date_time |
377 |
- ) |
378 |
- install(TARGETS rbd-replay-prep DESTINATION bin) |
379 |
- endif(HAVE_BABELTRACE) |
380 |
-diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt |
381 |
-index 82f5181f5b..8a51f140fb 100644 |
382 |
---- a/src/rgw/CMakeLists.txt |
383 |
-+++ b/src/rgw/CMakeLists.txt |
384 |
-@@ -202,7 +202,7 @@ if(WITH_CURL_OPENSSL) |
385 |
- endif() |
386 |
- |
387 |
- if(WITH_BOOST_CONTEXT) |
388 |
-- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context) |
389 |
-+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context) |
390 |
- endif() |
391 |
- |
392 |
- set(rgw_libs rgw_a) |
393 |
-@@ -353,7 +353,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT) |
394 |
- target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ) |
395 |
- endif() |
396 |
- if(WITH_BOOST_CONTEXT) |
397 |
-- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context) |
398 |
-+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context) |
399 |
- endif() |
400 |
- |
401 |
- if(WITH_TESTS) |
402 |
-diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt |
403 |
-index 5dcee1694d..60743be698 100644 |
404 |
---- a/src/test/CMakeLists.txt |
405 |
-+++ b/src/test/CMakeLists.txt |
406 |
-@@ -159,7 +159,7 @@ add_executable(ceph_omapbench |
407 |
- ) |
408 |
- target_link_libraries(ceph_omapbench |
409 |
- librados |
410 |
-- Boost::program_options |
411 |
-+ boost_program_options |
412 |
- global |
413 |
- ${BLKID_LIBRARIES} |
414 |
- ${CMAKE_DL_LIBS} |
415 |
-diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt |
416 |
-index 71fb77cda9..aff8fb6565 100644 |
417 |
---- a/src/test/common/CMakeLists.txt |
418 |
-+++ b/src/test/common/CMakeLists.txt |
419 |
-@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject) |
420 |
- |
421 |
- add_executable(unittest_async_completion test_async_completion.cc) |
422 |
- add_ceph_unittest(unittest_async_completion) |
423 |
--target_link_libraries(unittest_async_completion Boost::system) |
424 |
-+target_link_libraries(unittest_async_completion boost_system) |
425 |
- |
426 |
- add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc) |
427 |
- add_ceph_unittest(unittest_async_shared_mutex) |
428 |
--target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system) |
429 |
-+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system) |
430 |
-diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt |
431 |
-index 721f6c3675..1cd9635c77 100644 |
432 |
---- a/src/test/erasure-code/CMakeLists.txt |
433 |
-+++ b/src/test/erasure-code/CMakeLists.txt |
434 |
-@@ -2,15 +2,15 @@ |
435 |
- add_executable(ceph_erasure_code_benchmark |
436 |
- ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc |
437 |
- ceph_erasure_code_benchmark.cc) |
438 |
--target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
439 |
-+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
440 |
- install(TARGETS ceph_erasure_code_benchmark |
441 |
- DESTINATION bin) |
442 |
- |
443 |
- add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) |
444 |
--target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
445 |
-+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
446 |
- |
447 |
- add_executable(ceph_erasure_code ceph_erasure_code.cc) |
448 |
--target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
449 |
-+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
450 |
- install(TARGETS ceph_erasure_code |
451 |
- DESTINATION bin) |
452 |
- |
453 |
-diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt |
454 |
-index 4fc53d2406..e6304394f8 100644 |
455 |
---- a/src/test/librados/CMakeLists.txt |
456 |
-+++ b/src/test/librados/CMakeLists.txt |
457 |
-@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc) |
458 |
- target_link_libraries(ceph_test_rados_api_asio global |
459 |
- librados ${UNITTEST_LIBS}) |
460 |
- if(WITH_BOOST_CONTEXT) |
461 |
-- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) |
462 |
-+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) |
463 |
- endif() |
464 |
- |
465 |
- add_executable(ceph_test_rados_api_list |
466 |
-@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp |
467 |
- tier_cxx.cc |
468 |
- $<TARGET_OBJECTS:unit-main>) |
469 |
- target_link_libraries(ceph_test_rados_api_tier_pp |
470 |
-- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx) |
471 |
-+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx) |
472 |
- |
473 |
- add_executable(ceph_test_rados_api_snapshots |
474 |
- snapshots.cc) |
475 |
-diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt |
476 |
-index 3c3e9db6c1..2c208c1a4f 100644 |
477 |
---- a/src/test/librbd/CMakeLists.txt |
478 |
-+++ b/src/test/librbd/CMakeLists.txt |
479 |
-@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE |
480 |
- radostest |
481 |
- radostest-cxx |
482 |
- librados |
483 |
-- Boost::thread |
484 |
-+ boost_thread |
485 |
- GMock::GMock |
486 |
- GTest::GTest) |
487 |
- |
488 |
-diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt |
489 |
-index cde6348d57..e6ce738834 100644 |
490 |
---- a/src/test/rgw/CMakeLists.txt |
491 |
-+++ b/src/test/rgw/CMakeLists.txt |
492 |
-@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler) |
493 |
- target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock) |
494 |
- if(WITH_BOOST_CONTEXT) |
495 |
- target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) |
496 |
-- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) |
497 |
-+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context) |
498 |
- endif() |
499 |
- |
500 |
- if(WITH_RADOSGW_AMQP_ENDPOINT) |
501 |
-diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt |
502 |
-index d31f3d2408..6945018b11 100644 |
503 |
---- a/src/tools/CMakeLists.txt |
504 |
-+++ b/src/tools/CMakeLists.txt |
505 |
-@@ -35,20 +35,20 @@ install(PROGRAMS |
506 |
- endif(WITH_TESTS) |
507 |
- |
508 |
- add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) |
509 |
--target_link_libraries(ceph-osdomap-tool os global Boost::program_options) |
510 |
-+target_link_libraries(ceph-osdomap-tool os global boost_program_options) |
511 |
- install(TARGETS ceph-osdomap-tool DESTINATION bin) |
512 |
- |
513 |
- add_executable(ceph-monstore-tool |
514 |
- ceph_monstore_tool.cc |
515 |
- ../mgr/mgr_commands.cc) |
516 |
--target_link_libraries(ceph-monstore-tool os global Boost::program_options) |
517 |
-+target_link_libraries(ceph-monstore-tool os global boost_program_options) |
518 |
- install(TARGETS ceph-monstore-tool DESTINATION bin) |
519 |
- |
520 |
- add_executable(ceph-objectstore-tool |
521 |
- ceph_objectstore_tool.cc |
522 |
- rebuild_mondb.cc |
523 |
- RadosDump.cc) |
524 |
--target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) |
525 |
-+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) |
526 |
- if(WITH_FUSE) |
527 |
- target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES}) |
528 |
- endif(WITH_FUSE) |