1 |
commit: 411791b6a219ef34912bbad4abbbf3175198fafd |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Wed Feb 13 19:51:44 2019 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 13 19:51:44 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411791b6 |
7 |
|
8 |
sys-cluster/ceph: Update boost-sonames patch for 12.2.11 |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.60, Repoman-2.3.12 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
sys-cluster/ceph/ceph-12.2.11.ebuild | 2 +- |
15 |
.../ceph/files/ceph-12.2.11-boost-sonames.patch | 214 +++++++++++++++++++++ |
16 |
2 files changed, 215 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/sys-cluster/ceph/ceph-12.2.11.ebuild b/sys-cluster/ceph/ceph-12.2.11.ebuild |
19 |
index 4fe896d4cc1..d828bc7be4f 100644 |
20 |
--- a/sys-cluster/ceph/ceph-12.2.11.ebuild |
21 |
+++ b/sys-cluster/ceph/ceph-12.2.11.ebuild |
22 |
@@ -169,7 +169,7 @@ src_prepare() { |
23 |
cmake-utils_src_prepare |
24 |
|
25 |
if use system-boost; then |
26 |
- eapply "${FILESDIR}/ceph-12.2.5-boost-sonames.patch" |
27 |
+ eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch" |
28 |
fi |
29 |
|
30 |
# remove tests that need root access |
31 |
|
32 |
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 |
33 |
new file mode 100644 |
34 |
index 00000000000..bd17686bd9a |
35 |
--- /dev/null |
36 |
+++ b/sys-cluster/ceph/files/ceph-12.2.11-boost-sonames.patch |
37 |
@@ -0,0 +1,214 @@ |
38 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
39 |
+index 5403de8f4c..ee3336ee27 100644 |
40 |
+--- a/CMakeLists.txt |
41 |
++++ b/CMakeLists.txt |
42 |
+@@ -563,7 +563,7 @@ set(BOOST_COMPONENTS |
43 |
+ set(BOOST_HEADER_COMPONENTS container) |
44 |
+ |
45 |
+ if(WITH_MGR) |
46 |
+- list(APPEND BOOST_COMPONENTS python) |
47 |
++ list(APPEND BOOST_COMPONENTS python-${EPYTHON_VERSION}) |
48 |
+ endif() |
49 |
+ if(WITH_BOOST_CONTEXT) |
50 |
+ list(APPEND BOOST_COMPONENTS context coroutine) |
51 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
52 |
+index b0837ab1d9..e12cecf354 100644 |
53 |
+--- a/src/CMakeLists.txt |
54 |
++++ b/src/CMakeLists.txt |
55 |
+@@ -623,13 +623,13 @@ set(ceph_common_objs |
56 |
+ $<TARGET_OBJECTS:crush_objs>) |
57 |
+ set(ceph_common_deps |
58 |
+ json_spirit erasure_code rt ${LIB_RESOLV} |
59 |
+- Boost::thread |
60 |
+- Boost::system |
61 |
+- Boost::regex |
62 |
+- Boost::random |
63 |
+- Boost::program_options |
64 |
+- Boost::date_time |
65 |
+- Boost::iostreams |
66 |
++ boost_thread |
67 |
++ boost_system |
68 |
++ boost_regex |
69 |
++ boost_random |
70 |
++ boost_program_options |
71 |
++ boost_date_time |
72 |
++ boost_iostreams |
73 |
+ ${BLKID_LIBRARIES} |
74 |
+ ${Backtrace_LIBRARIES} |
75 |
+ ${BLKIN_LIBRARIES} |
76 |
+@@ -727,7 +727,7 @@ if (WITH_MGR) |
77 |
+ $<TARGET_OBJECTS:heap_profiler_objs>) |
78 |
+ target_include_directories(ceph-mgr PRIVATE "${PYTHON_INCLUDE_DIRS}") |
79 |
+ target_link_libraries(ceph-mgr osdc client global-static common |
80 |
+- Boost::python ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
81 |
++ boost_python-${EPYTHON_VERSION} ${PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS}) |
82 |
+ install(TARGETS ceph-mgr DESTINATION bin) |
83 |
+ endif (WITH_MGR) |
84 |
+ |
85 |
+@@ -901,7 +901,7 @@ set(ceph_mds_srcs |
86 |
+ ceph_mds.cc) |
87 |
+ add_executable(ceph-mds ${ceph_mds_srcs}) |
88 |
+ target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static common |
89 |
+- Boost::thread) |
90 |
++ boost_thread) |
91 |
+ install(TARGETS ceph-mds DESTINATION bin) |
92 |
+ |
93 |
+ add_subdirectory(erasure-code) |
94 |
+diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt |
95 |
+index 57cb2a5b94..971af8ebec 100644 |
96 |
+--- a/src/rgw/CMakeLists.txt |
97 |
++++ b/src/rgw/CMakeLists.txt |
98 |
+@@ -156,7 +156,7 @@ if (WITH_CURL_OPENSSL OR (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPE |
99 |
+ endif() |
100 |
+ if (WITH_RADOSGW_BEAST_FRONTEND) |
101 |
+ target_compile_definitions(rgw_a PUBLIC BOOST_COROUTINES_NO_DEPRECATION_WARNING) |
102 |
+- target_link_libraries(rgw_a Boost::coroutine Boost::context) |
103 |
++ target_link_libraries(rgw_a boost_coroutine boost_context) |
104 |
+ endif() |
105 |
+ |
106 |
+ set(radosgw_srcs |
107 |
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt |
108 |
+index 66e24b8bc9..0f659c98e2 100644 |
109 |
+--- a/src/test/CMakeLists.txt |
110 |
++++ b/src/test/CMakeLists.txt |
111 |
+@@ -145,7 +145,7 @@ add_executable(ceph_omapbench |
112 |
+ ) |
113 |
+ target_link_libraries(ceph_omapbench |
114 |
+ librados |
115 |
+- Boost::program_options |
116 |
++ boost_program_options |
117 |
+ global |
118 |
+ ${BLKID_LIBRARIES} |
119 |
+ ${CMAKE_DL_LIBS} |
120 |
+@@ -199,7 +199,7 @@ if(${WITH_RADOSGW}) |
121 |
+ cls_rgw_client |
122 |
+ cls_user_client |
123 |
+ cls_lock_client |
124 |
+- Boost::regex |
125 |
++ boost_regex |
126 |
+ ${BLKID_LIBRARIES} |
127 |
+ ${CURL_LIBRARIES} |
128 |
+ ${EXPAT_LIBRARIES} |
129 |
+@@ -229,7 +229,7 @@ if(${WITH_RADOSGW}) |
130 |
+ cls_rgw_client |
131 |
+ cls_user_client |
132 |
+ cls_lock_client |
133 |
+- Boost::regex |
134 |
++ boost_regex |
135 |
+ ${BLKID_LIBRARIES} |
136 |
+ ${CURL_LIBRARIES} |
137 |
+ ${EXPAT_LIBRARIES} |
138 |
+diff --git a/src/test/bench/CMakeLists.txt b/src/test/bench/CMakeLists.txt |
139 |
+index 9fba701e05..da3cbcfe96 100644 |
140 |
+--- a/src/test/bench/CMakeLists.txt |
141 |
++++ b/src/test/bench/CMakeLists.txt |
142 |
+@@ -8,7 +8,7 @@ set(smalliobench_srcs |
143 |
+ add_executable(ceph_smalliobench |
144 |
+ ${smalliobench_srcs} |
145 |
+ ) |
146 |
+-target_link_libraries(ceph_smalliobench librados Boost::program_options global |
147 |
++target_link_libraries(ceph_smalliobench librados boost_program_options global |
148 |
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
149 |
+ |
150 |
+ # ceph_smalliobenchrbd |
151 |
+@@ -27,7 +27,7 @@ if(WITH_RBD) |
152 |
+ librados |
153 |
+ os |
154 |
+ global |
155 |
+- Boost::program_options |
156 |
++ boost_program_options |
157 |
+ ${BLKID_LIBRARIES} |
158 |
+ ${CMAKE_DL_LIBS} |
159 |
+ ) |
160 |
+@@ -50,7 +50,7 @@ set(ceph_smalliobenchfs_srcs |
161 |
+ add_executable(ceph_smalliobenchfs |
162 |
+ ${ceph_smalliobenchfs_srcs} |
163 |
+ ) |
164 |
+-target_link_libraries(ceph_smalliobenchfs librados Boost::program_options os global |
165 |
++target_link_libraries(ceph_smalliobenchfs librados boost_program_options os global |
166 |
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
167 |
+ |
168 |
+ # ceph_smalliobenchdumb |
169 |
+@@ -63,7 +63,7 @@ set(smalliobenchdumb_srcs |
170 |
+ add_executable(ceph_smalliobenchdumb |
171 |
+ ${smalliobenchdumb_srcs} |
172 |
+ ) |
173 |
+-target_link_libraries(ceph_smalliobenchdumb librados Boost::program_options os global |
174 |
++target_link_libraries(ceph_smalliobenchdumb librados boost_program_options os global |
175 |
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
176 |
+ |
177 |
+ # ceph_tpbench |
178 |
+@@ -73,7 +73,7 @@ set(tpbench_srcs |
179 |
+ add_executable(ceph_tpbench |
180 |
+ ${tpbench_srcs} |
181 |
+ ) |
182 |
+-target_link_libraries(ceph_tpbench librados Boost::program_options global |
183 |
++target_link_libraries(ceph_tpbench librados boost_program_options global |
184 |
+ ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) |
185 |
+ |
186 |
+ install(TARGETS |
187 |
+diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt |
188 |
+index dc4e0865d0..69502342bb 100644 |
189 |
+--- a/src/test/erasure-code/CMakeLists.txt |
190 |
++++ b/src/test/erasure-code/CMakeLists.txt |
191 |
+@@ -2,15 +2,15 @@ |
192 |
+ add_executable(ceph_erasure_code_benchmark |
193 |
+ ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc |
194 |
+ ceph_erasure_code_benchmark.cc) |
195 |
+-target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
196 |
++target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
197 |
+ install(TARGETS ceph_erasure_code_benchmark |
198 |
+ DESTINATION bin) |
199 |
+ |
200 |
+ add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) |
201 |
+-target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
202 |
++target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
203 |
+ |
204 |
+ add_executable(ceph_erasure_code ceph_erasure_code.cc) |
205 |
+-target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) |
206 |
++target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) |
207 |
+ install(TARGETS ceph_erasure_code |
208 |
+ DESTINATION bin) |
209 |
+ |
210 |
+diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt |
211 |
+index c35ddb3d8f..3916544259 100644 |
212 |
+--- a/src/test/librados/CMakeLists.txt |
213 |
++++ b/src/test/librados/CMakeLists.txt |
214 |
+@@ -137,7 +137,7 @@ add_executable(ceph_test_rados_api_tier |
215 |
+ set_target_properties(ceph_test_rados_api_tier PROPERTIES COMPILE_FLAGS |
216 |
+ ${UNITTEST_CXX_FLAGS}) |
217 |
+ target_link_libraries(ceph_test_rados_api_tier |
218 |
+- global rados_a ${UNITTEST_LIBS} Boost::system radostest) |
219 |
++ global rados_a ${UNITTEST_LIBS} boost_system radostest) |
220 |
+ |
221 |
+ # ceph_test_rados_api_snapshots |
222 |
+ add_executable(ceph_test_rados_api_snapshots |
223 |
+diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt |
224 |
+index 9f72fa3b48..665c977606 100644 |
225 |
+--- a/src/tools/CMakeLists.txt |
226 |
++++ b/src/tools/CMakeLists.txt |
227 |
+@@ -24,13 +24,13 @@ target_link_libraries(ceph_radosacl librados global) |
228 |
+ install(TARGETS ceph_radosacl DESTINATION bin) |
229 |
+ |
230 |
+ add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) |
231 |
+-target_link_libraries(ceph-osdomap-tool os global Boost::program_options) |
232 |
++target_link_libraries(ceph-osdomap-tool os global boost_program_options) |
233 |
+ install(TARGETS ceph-osdomap-tool DESTINATION bin) |
234 |
+ |
235 |
+ add_executable(ceph-monstore-tool |
236 |
+ ceph_monstore_tool.cc |
237 |
+ ../mgr/mgr_commands.cc) |
238 |
+-target_link_libraries(ceph-monstore-tool os global Boost::program_options) |
239 |
++target_link_libraries(ceph-monstore-tool os global boost_program_options) |
240 |
+ install(TARGETS ceph-monstore-tool DESTINATION bin) |
241 |
+ install(PROGRAMS |
242 |
+ ceph-monstore-update-crush.sh |
243 |
+@@ -41,7 +41,7 @@ add_executable(ceph-objectstore-tool |
244 |
+ ceph_objectstore_tool.cc |
245 |
+ rebuild_mondb.cc |
246 |
+ RadosDump.cc) |
247 |
+-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) |
248 |
++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) |
249 |
+ if(WITH_FUSE) |
250 |
+ target_link_libraries(ceph-objectstore-tool fuse) |
251 |
+ endif(WITH_FUSE) |