Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/, sys-cluster/ceph/
Date: Thu, 23 Apr 2020 20:44:34
Message-Id: 1587674662.1a0923bb23a6efb653d10489cb143221d5c57a42.chutzpah@gentoo
1 commit: 1a0923bb23a6efb653d10489cb143221d5c57a42
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Thu Apr 23 20:42:03 2020 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 23 20:44:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0923bb
7
8 sys-cluster/ceph: remove old
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.99, Repoman-2.3.22
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 sys-cluster/ceph/Manifest | 1 -
15 sys-cluster/ceph/ceph-12.2.12-r2.ebuild | 320 ------------
16 sys-cluster/ceph/ceph-14.2.8-r1.ebuild | 368 --------------
17 sys-cluster/ceph/ceph-14.2.8.ebuild | 368 --------------
18 sys-cluster/ceph/ceph-14.2.9.ebuild | 366 --------------
19 sys-cluster/ceph/ceph-15.2.1.ebuild | 389 ---------------
20 .../ceph/files/ceph-14.2.8-boost-sonames.patch | 538 ---------------------
21 7 files changed, 2350 deletions(-)
22
23 diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest
24 index b5d41bfe5a8..4e3cf108066 100644
25 --- a/sys-cluster/ceph/Manifest
26 +++ b/sys-cluster/ceph/Manifest
27 @@ -1,5 +1,4 @@
28 DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7881cd9c2e185eca12096efb79d21578659d248eb5bae678924983d57452d370e23ab7e78663764d7bea834a461 SHA512 e694c9a8c1f9836c08fb74b54423bdc16d4900252e34643c56cf1a615d4dacddfb13df06a6a9f68bb9d438f5f07069ed358f9fa4b5a362640a3046f9c7722dcc
29 DIST ceph-14.2.7.tar.gz 116647114 BLAKE2B f6971324b0467cfdb863db553b6feacaf3607b14fb9adae2808bd6e5514fc5ce218482c412b80902c22a74b883ed697f2c126bc687c8733a83de5b970593efa2 SHA512 59f475e56053ba5e7e3a482a3a91b4d44272e6ec8051b92783de76c09c0d967a7ef76676db998968a709e48f08e90828dd8f86bd96a7c3fd111d48bfb7fd93b1
30 -DIST ceph-14.2.8.tar.gz 128415417 BLAKE2B bb3644938106aaefe17d29fd6adc8568a35e6aef799da048add5ecebb6fb0128a8575eba1f5ecc2f33f33caf2130619e5b6979a6291566e0971976d8da0e8387 SHA512 38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f2117674545b2147d8730973b01967ddcd4322a769ba03f9c625417ed35cc39f195a
31 DIST ceph-14.2.9.tar.gz 128419205 BLAKE2B bace7469d9066a3da7320a0eb894013fae5b7139c15679dddae7df28c593a1029956234a1ba0d3bbdf1639e3a975aa776c695efefb915113a16099c80d563675 SHA512 0a26372d0037c32fe1d24be880e272fcce5089b02adfb0e791e0406155f6e66c913fa43762028f49c1fa3f30c6c8d819c521dd11702a37cc7040dfd3097c068e
32 DIST ceph-15.2.1.tar.gz 147551715 BLAKE2B fcb5683493431ffc75aced3be7faf5a0486052df695d3133572bb9728fd4863fb88117bd9b13e4bf89c7e4afeea2888bbb252df48b0f52c33ce6202a6f4f7f87 SHA512 01589875078466321aaaeead8d7e21baf670e68c3d1f3168de188f3ad93eada745affb9da30217c8cb4938cbfdbe6bdf6bfd074fe8eb01863e1e8448f06a2304
33
34 diff --git a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
35 deleted file mode 100644
36 index 5ce8a64ecb1..00000000000
37 --- a/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
38 +++ /dev/null
39 @@ -1,320 +0,0 @@
40 -# Copyright 1999-2020 Gentoo Authors
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=7
44 -PYTHON_COMPAT=( python3_6 )
45 -DISTUTILS_OPTIONAL=1
46 -
47 -inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \
48 - python-r1 udev readme.gentoo-r1 systemd
49 -
50 -if [[ ${PV} == *9999* ]]; then
51 - inherit git-r3
52 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
53 - SRC_URI=""
54 -else
55 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
56 - # currently broken (bug #708294)
57 - #KEYWORDS="~amd64 ~arm64 ~x86"
58 -fi
59 -
60 -DESCRIPTION="Ceph distributed filesystem"
61 -HOMEPAGE="https://ceph.com/"
62 -
63 -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 BSD Boost-1.0 MIT"
64 -SLOT="0"
65 -
66 -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
67 -
68 -IUSE="babeltrace cephfs fuse jemalloc ldap lttng +mgr nss +radosgw +ssl"
69 -IUSE+=" static-libs +system-boost systemd +tcmalloc test xfs zfs"
70 -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
71 -
72 -# unbundling code commented out pending bugs 584056 and 584058
73 -#>=dev-libs/jerasure-2.0.0-r1
74 -#>=dev-libs/gf-complete-2.0.0
75 -COMMON_DEPEND="
76 - acct-group/ceph
77 - acct-user/ceph
78 - virtual/libudev:=
79 - app-arch/bzip2:=[static-libs?]
80 - app-arch/lz4:=[static-libs?]
81 - app-arch/snappy:=[static-libs(-)?]
82 - app-arch/zstd:=[static-libs?]
83 - app-misc/jq:=[static-libs?]
84 - <dev-libs/crypto++-7.0:=[static-libs?]
85 - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?]
86 - dev-libs/libaio:=[static-libs?]
87 - dev-libs/libxml2:=[static-libs?]
88 - sys-apps/keyutils:=[static-libs?]
89 - sys-apps/util-linux:=[static-libs?]
90 - sys-libs/zlib:=[static-libs?]
91 - babeltrace? ( dev-util/babeltrace )
92 - ldap? ( net-nds/openldap:=[static-libs?] )
93 - lttng? ( dev-util/lttng-ust:= )
94 - nss? ( dev-libs/nss:= )
95 - fuse? ( sys-fs/fuse:0=[static-libs?] )
96 - xfs? ( sys-fs/xfsprogs:=[static-libs?] )
97 - zfs? ( sys-fs/zfs:=[static-libs?] )
98 - ssl? ( dev-libs/openssl:0=[static-libs?] )
99 - radosgw? (
100 - dev-libs/expat:=[static-libs?]
101 - <dev-libs/openssl-1.1:=[static-libs?]
102 - net-misc/curl:=[curl_ssl_openssl,static-libs?]
103 - )
104 - system-boost? (
105 - =dev-libs/boost-1.66*:=[threads,context,python,static-libs?,${PYTHON_USEDEP}]
106 - )
107 - jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
108 - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] )
109 - ${PYTHON_DEPS}
110 - "
111 -DEPEND="${COMMON_DEPEND}
112 - app-arch/cpio
113 - amd64? ( dev-lang/yasm )
114 - x86? ( dev-lang/yasm )
115 - dev-python/cython[${PYTHON_USEDEP}]
116 - dev-python/sphinx
117 - dev-util/gperf
118 - dev-util/valgrind
119 - sys-apps/which
120 - sys-devel/bc
121 - virtual/pkgconfig
122 - test? (
123 - dev-python/virtualenv[${PYTHON_USEDEP}]
124 - sys-apps/grep[pcre]
125 - sys-fs/btrfs-progs
126 - )"
127 -RDEPEND="${COMMON_DEPEND}
128 - net-misc/socat
129 - sys-apps/gptfdisk
130 - sys-block/parted
131 - sys-fs/e2fsprogs
132 - sys-fs/cryptsetup
133 - sys-fs/lvm2
134 - !<sys-apps/openrc-0.26.3
135 - dev-python/cherrypy[${PYTHON_USEDEP}]
136 - dev-python/flask[${PYTHON_USEDEP}]
137 - dev-python/jinja[${PYTHON_USEDEP}]
138 - dev-python/pecan[${PYTHON_USEDEP}]
139 - dev-python/prettytable[${PYTHON_USEDEP}]
140 - dev-python/pyopenssl[${PYTHON_USEDEP}]
141 - dev-python/requests[${PYTHON_USEDEP}]
142 - dev-python/werkzeug[${PYTHON_USEDEP}]
143 - "
144 -REQUIRED_USE="
145 - $(python_gen_useflags 'python2*')
146 - ${PYTHON_REQUIRED_USE}
147 - ?? ( ssl nss )
148 - ?? ( jemalloc tcmalloc )
149 - "
150 -
151 -RESTRICT="test? ( userpriv )"
152 -
153 -# distribution tarball does not include everything needed for tests
154 -RESTRICT+=" test"
155 -
156 -# false positives unless all USE flags are on
157 -CMAKE_WARN_UNUSED_CLI="no"
158 -
159 -# ninja does not work at all
160 -CMAKE_MAKEFILE_GENERATOR="emake"
161 -
162 -UNBUNDLE_LIBS=(
163 - src/erasure-code/jerasure/jerasure
164 - src/erasure-code/jerasure/gf-complete
165 -)
166 -
167 -PATCHES=(
168 - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
169 - "${FILESDIR}/ceph-12.2.0-cflags.patch"
170 - "${FILESDIR}/ceph-12.2.1-systemd-unitdir.patch"
171 - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
172 - "${FILESDIR}/ceph-12.2.4-cflags.patch"
173 - "${FILESDIR}/ceph-12.2.4-rocksdb-cflags.patch"
174 - "${FILESDIR}/ceph-12.2.5-no-werror.patch"
175 - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
176 - "${FILESDIR}/ceph-12.2.11-fix-min-call.patch"
177 - "${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch"
178 - "${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch"
179 - "${FILESDIR}/ceph-12.2.12-qa-warning.patch"
180 - "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch"
181 -)
182 -
183 -check-reqs_export_vars() {
184 - if use amd64; then
185 - CHECKREQS_DISK_BUILD="12G"
186 - CHECKREQS_DISK_USR="460M"
187 - else
188 - CHECKREQS_DISK_BUILD="1400M"
189 - CHECKREQS_DISK_USR="450M"
190 - fi
191 -
192 - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
193 -}
194 -
195 -user_setup() {
196 - enewgroup ceph ${CEPH_GID}
197 - enewuser ceph "${CEPH_UID:--1}" -1 /var/lib/ceph ceph
198 -}
199 -
200 -pkg_pretend() {
201 - check-reqs_export_vars
202 - check-reqs_pkg_pretend
203 -}
204 -
205 -pkg_setup() {
206 - python_setup 'python2*'
207 - check-reqs_export_vars
208 - check-reqs_pkg_setup
209 - user_setup
210 -}
211 -
212 -src_prepare() {
213 - cmake-utils_src_prepare
214 -
215 - if use system-boost; then
216 - eapply "${FILESDIR}/ceph-12.2.11-boost-sonames.patch"
217 - fi
218 -
219 - # remove tests that need root access
220 - rm src/test/cli/ceph-authtool/cap*.t
221 -
222 - #rm -rf "${UNBUNDLE_LIBS[@]}"
223 -}
224 -
225 -ceph_src_configure() {
226 - local flag
227 - local mycmakeargs=(
228 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
229 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
230 - -DWITH_BABELTRACE=$(usex babeltrace)
231 - -DWITH_CEPHFS=$(usex cephfs)
232 - -DWITH_FUSE=$(usex fuse)
233 - -DWITH_LTTNG=$(usex lttng)
234 - -DWITH_MGR=$(usex mgr)
235 - -DWITH_NSS=$(usex nss)
236 - -DWITH_OPENLDAP=$(usex ldap)
237 - -DWITH_RADOSGW=$(usex radosgw)
238 - -DWITH_SSL=$(usex ssl)
239 - -DWITH_SYSTEMD=$(usex systemd)
240 - -DWITH_TESTS=$(usex test)
241 - -DWITH_XFS=$(usex xfs)
242 - -DWITH_ZFS=$(usex zfs)
243 - -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no')
244 - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
245 - -DWITH_SYSTEM_BOOST=$(usex system-boost)
246 - -DBOOST_J=$(makeopts_jobs)
247 - -DWITH_RDMA=no
248 - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
249 - -DEPYTHON_VERSION="${EPYTHON#python}"
250 - )
251 - if use amd64 || use x86; then
252 - for flag in ${CPU_FLAGS_X86[@]}; do
253 - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
254 - done
255 - fi
256 -
257 - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt"
258 - cmake-utils_src_configure
259 -
260 - # bug #630232
261 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
262 - "${BUILD_DIR:--${S}}"/include/acconfig.h \
263 - || die "sed failed"
264 -}
265 -
266 -src_configure() {
267 - ceph_src_configure
268 -}
269 -
270 -python_compile() {
271 - local CMAKE_USE_DIR="${S}"
272 -
273 - ceph_src_configure
274 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
275 - emake VERBOSE=1 all
276 -
277 - # python modules are only compiled with "make install" so we need to do this to
278 - # prevent doing a bunch of compilation in src_install
279 - DESTDIR="${T}" emake VERBOSE=1 install
280 - popd >/dev/null || die
281 -}
282 -
283 -src_compile() {
284 - cmake-utils_src_make all
285 -
286 - # we have to do this here to prevent from building everything multiple times
287 - python_copy_sources
288 - python_foreach_impl python_compile
289 -}
290 -
291 -src_test() {
292 - make check || die "make check failed"
293 -}
294 -
295 -python_install() {
296 - local CMAKE_USE_DIR="${S}"
297 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
298 - DESTDIR="${ED}" emake install
299 - popd >/dev/null || die
300 -}
301 -
302 -src_install() {
303 - cmake-utils_src_install
304 - python_foreach_impl python_install
305 -
306 - find "${D}" -name '*.la' -delete || die
307 -
308 - exeinto /usr/$(get_libdir)/ceph
309 - newexe "${BUILD_DIR}/bin/init-ceph" ceph_init.sh
310 -
311 - insinto /etc/logrotate.d/
312 - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
313 -
314 - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
315 -
316 - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
317 -
318 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
319 - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
320 - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
321 -
322 - insinto /etc/sysctl.d
323 - newins "${FILESDIR}"/sysctld 90-${PN}.conf
324 -
325 - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
326 -
327 - # units aren't installed by the build system unless systemd is enabled
328 - # so no point installing these with the USE flag disabled
329 - if use systemd; then
330 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
331 - "ceph-mds@.service"
332 -
333 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
334 - "ceph-osd@.service"
335 - fi
336 -
337 - udev_dorules udev/*.rules
338 -
339 - readme.gentoo_create_doc
340 -
341 - python_setup 'python2*'
342 -
343 - # bug #630232
344 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph \
345 - || die "sed failed"
346 -
347 - python_fix_shebang "${ED}"/usr/{,s}bin/
348 -
349 - # python_fix_shebang apparently is not idempotent
350 - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \
351 - "${ED}"/usr/{sbin/ceph-disk,bin/ceph-detect-init} || die "sed failed"
352 -
353 - local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* )
354 - dostrip -x "${rados_classes[@]#${D}}"
355 -}
356 -
357 -pkg_postinst() {
358 - readme.gentoo_print_elog
359 -}
360
361 diff --git a/sys-cluster/ceph/ceph-14.2.8-r1.ebuild b/sys-cluster/ceph/ceph-14.2.8-r1.ebuild
362 deleted file mode 100644
363 index c2fa46f1c65..00000000000
364 --- a/sys-cluster/ceph/ceph-14.2.8-r1.ebuild
365 +++ /dev/null
366 @@ -1,368 +0,0 @@
367 -# Copyright 1999-2020 Gentoo Authors
368 -# Distributed under the terms of the GNU General Public License v2
369 -
370 -EAPI=7
371 -PYTHON_COMPAT=( python3_{6,7} )
372 -CMAKE_MAKEFILE_GENERATOR=emake
373 -
374 -DISTUTILS_OPTIONAL=1
375 -
376 -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
377 - multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
378 - systemd
379 -
380 -if [[ ${PV} == *9999* ]]; then
381 - inherit git-r3
382 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
383 - SRC_URI=""
384 -else
385 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
386 - KEYWORDS="~amd64 ~ppc64"
387 -fi
388 -
389 -DESCRIPTION="Ceph distributed filesystem"
390 -HOMEPAGE="https://ceph.com/"
391 -
392 -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
393 -SLOT="0"
394 -
395 -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
396 -
397 -IUSE="babeltrace +cephfs custom-cflags dpdk fuse grafana jemalloc kerberos ldap"
398 -IUSE+=" libressl lttng +mgr numa rabbitmq +radosgw +ssl spdk "
399 -IUSE+=" system-boost systemd +tcmalloc test xfs zfs"
400 -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
401 -
402 -COMMON_DEPEND="
403 - acct-group/ceph
404 - acct-user/ceph
405 - virtual/libudev:=
406 - app-arch/bzip2:=
407 - app-arch/lz4:=
408 - app-arch/snappy:=
409 - app-arch/zstd:=
410 - app-shells/bash:0
411 - app-misc/jq:=
412 - dev-libs/crypto++:=
413 - dev-libs/leveldb:=[snappy,tcmalloc(-)?]
414 - dev-libs/libaio:=
415 - dev-libs/libnl:3=
416 - dev-libs/libxml2:=
417 - dev-libs/nss:=
418 - sys-auth/oath-toolkit:=
419 - sys-apps/coreutils
420 - sys-apps/grep
421 - sys-apps/keyutils:=
422 - sys-apps/util-linux:=
423 - sys-apps/sed
424 - sys-apps/util-linux
425 - sys-libs/libcap-ng:=
426 - sys-libs/ncurses:0=
427 - sys-libs/zlib:=
428 - babeltrace? ( dev-util/babeltrace )
429 - ldap? ( net-nds/openldap:= )
430 - lttng? ( dev-util/lttng-ust:= )
431 - fuse? ( sys-fs/fuse:0= )
432 - kerberos? ( virtual/krb5 )
433 - rabbitmq? ( net-libs/rabbitmq-c:= )
434 - ssl? (
435 - !libressl? ( dev-libs/openssl:= )
436 - libressl? ( dev-libs/libressl:= )
437 - )
438 - xfs? ( sys-fs/xfsprogs:= )
439 - zfs? ( sys-fs/zfs:= )
440 - radosgw? (
441 - dev-libs/expat:=
442 - !libressl? (
443 - dev-libs/openssl:=
444 - net-misc/curl:=[curl_ssl_openssl]
445 - )
446 - libressl? (
447 - dev-libs/libressl:=
448 - net-misc/curl:=[curl_ssl_libressl]
449 - )
450 - )
451 - system-boost? ( =dev-libs/boost-1.72*[threads,context,python,${PYTHON_USEDEP}] )
452 - jemalloc? ( dev-libs/jemalloc:= )
453 - !jemalloc? ( >=dev-util/google-perftools-2.6.1:= )
454 - ${PYTHON_DEPS}
455 -"
456 -BDEPEND="
457 - amd64? ( dev-lang/yasm )
458 - x86? ( dev-lang/yasm )
459 - app-arch/cpio
460 - >=dev-util/cmake-3.5.0
461 - dev-python/cython[${PYTHON_USEDEP}]
462 - dev-python/sphinx
463 - dev-util/cunit
464 - dev-util/gperf
465 - dev-util/valgrind
466 - sys-apps/coreutils
467 - sys-apps/findutils
468 - sys-apps/grep
469 - sys-apps/sed
470 - sys-apps/which
471 - sys-devel/bc
472 - sys-devel/patch
473 - virtual/pkgconfig
474 - test? (
475 - dev-python/coverage[${PYTHON_USEDEP}]
476 - dev-python/virtualenv[${PYTHON_USEDEP}]
477 - dev-python/requests-mock[${PYTHON_USEDEP}]
478 - sys-apps/grep[pcre]
479 - sys-fs/btrfs-progs
480 - )
481 -"
482 -RDEPEND="${COMMON_DEPEND}
483 - net-misc/socat
484 - sys-apps/gptfdisk
485 - sys-block/parted
486 - sys-fs/cryptsetup
487 - sys-fs/lvm2[-device-mapper-only(-)]
488 - sys-fs/lsscsi
489 - virtual/awk
490 - dev-python/bcrypt[${PYTHON_USEDEP}]
491 - dev-python/cherrypy[${PYTHON_USEDEP}]
492 - dev-python/flask[${PYTHON_USEDEP}]
493 - dev-python/jinja[${PYTHON_USEDEP}]
494 - dev-python/pecan[${PYTHON_USEDEP}]
495 - dev-python/prettytable[${PYTHON_USEDEP}]
496 - dev-python/pyopenssl[${PYTHON_USEDEP}]
497 - dev-python/requests[${PYTHON_USEDEP}]
498 - dev-python/werkzeug[${PYTHON_USEDEP}]
499 - mgr? (
500 - dev-python/more-itertools[${PYTHON_USEDEP}]
501 - dev-python/pyjwt[${PYTHON_USEDEP}]
502 - dev-python/pyyaml[${PYTHON_USEDEP}]
503 - dev-python/routes[${PYTHON_USEDEP}]
504 - dev-python/six[${PYTHON_USEDEP}]
505 - )
506 -"
507 -REQUIRED_USE="
508 - ${PYTHON_REQUIRED_USE}
509 - mgr? ( cephfs )
510 - ?? ( jemalloc tcmalloc )
511 - rabbitmq? ( radosgw )
512 -"
513 -
514 -# the tests need root access
515 -RESTRICT="test? ( userpriv )"
516 -
517 -# distribution tarball does not include everything needed for tests
518 -RESTRICT+=" test"
519 -
520 -# false positives unless all USE flags are on
521 -CMAKE_WARN_UNUSED_CLI="no"
522 -
523 -PATCHES=(
524 - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
525 - "${FILESDIR}/ceph-14.2.0-cflags.patch"
526 - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
527 - "${FILESDIR}/ceph-13.2.0-cflags.patch"
528 - "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
529 - "${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
530 - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
531 - "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
532 - "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
533 - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
534 - "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
535 - "${FILESDIR}/ceph-14.2.4-python-executable.patch"
536 - "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
537 -)
538 -
539 -check-reqs_export_vars() {
540 - if use amd64; then
541 - CHECKREQS_DISK_BUILD="12G"
542 - CHECKREQS_DISK_USR="460M"
543 - else
544 - CHECKREQS_DISK_BUILD="1400M"
545 - CHECKREQS_DISK_USR="450M"
546 - fi
547 -
548 - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
549 -}
550 -
551 -pkg_pretend() {
552 - check-reqs_export_vars
553 - check-reqs_pkg_pretend
554 -}
555 -
556 -pkg_setup() {
557 - python_setup 'python3*'
558 - check-reqs_export_vars
559 - check-reqs_pkg_setup
560 -}
561 -
562 -src_prepare() {
563 - cmake-utils_src_prepare
564 -
565 - if use system-boost; then
566 - eapply "${FILESDIR}/ceph-14.2.8-boost-sonames.patch"
567 -
568 - find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
569 - | xargs --null sed \
570 - -e 's|Boost::|Boost_|g' \
571 - -e 's|Boost_boost|boost_system|g' -i || die
572 - fi
573 -
574 - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
575 - src/bash_completion/CMakeLists.txt || die
576 -
577 - # remove tests that need root access
578 - rm src/test/cli/ceph-authtool/cap*.t || die
579 -}
580 -
581 -ceph_src_configure() {
582 - local flag
583 - local mycmakeargs=(
584 - -DWITH_BABELTRACE=$(usex babeltrace)
585 - -DWITH_CEPHFS=$(usex cephfs)
586 - -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
587 - -DWITH_DPDK=$(usex dpdk)
588 - -DWITH_DPDK=$(usex spdk)
589 - -DWITH_FUSE=$(usex fuse)
590 - -DWITH_LTTNG=$(usex lttng)
591 - -DWITH_GSSAPI=$(usex kerberos)
592 - -DWITH_GRAFANA=$(usex grafana)
593 - -DWITH_MGR=$(usex mgr)
594 - -DWITH_MGR_DASHBOARD_FRONTEND=NO
595 - -DWITH_NUMA=$(usex numa)
596 - -DWITH_OPENLDAP=$(usex ldap)
597 - -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
598 - -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
599 - -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
600 - -DWITH_RADOSGW=$(usex radosgw)
601 - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
602 - -DWITH_SSL=$(usex ssl)
603 - -DWITH_SYSTEMD=$(usex systemd)
604 - -DWITH_TESTS=$(usex test)
605 - -DWITH_XFS=$(usex xfs)
606 - -DWITH_ZFS=$(usex zfs)
607 - -DENABLE_SHARED='ON'
608 - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
609 - -DWITH_SYSTEM_BOOST=$(usex system-boost)
610 - -DBOOST_J=$(makeopts_jobs)
611 - -DWITH_RDMA=no
612 - -DWITH_TBB=no
613 - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
614 - -DEPYTHON_VERSION="${EPYTHON#python}"
615 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
616 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
617 - #-Wno-dev
618 - )
619 - if use amd64 || use x86; then
620 - for flag in ${CPU_FLAGS_X86[@]}; do
621 - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
622 - done
623 - fi
624 -
625 - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
626 - || die "failed to remove cmake cache"
627 -
628 - cmake-utils_src_configure
629 -
630 - # bug #630232
631 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
632 - "${BUILD_DIR:-${S}}"/include/acconfig.h \
633 - || die "sed failed"
634 -}
635 -
636 -src_configure() {
637 - use custom-cflags || strip-flags
638 - ceph_src_configure
639 -}
640 -
641 -python_compile() {
642 - local CMAKE_USE_DIR="${S}"
643 - ceph_src_configure
644 -
645 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
646 - emake VERBOSE=1 clean
647 - emake VERBOSE=1 all
648 -
649 - # python modules are only compiled with "make install" so we need to do this to
650 - # prevent doing a bunch of compilation in src_install
651 - DESTDIR="${T}" emake VERBOSE=1 install
652 - popd >/dev/null || die
653 -}
654 -
655 -src_compile() {
656 - cmake-utils_src_make VERBOSE=1 all
657 -
658 - # we have to do this here to prevent from building everything multiple times
659 - python_copy_sources
660 - python_foreach_impl python_compile
661 -}
662 -
663 -src_test() {
664 - make check || die "make check failed"
665 -}
666 -
667 -python_install() {
668 - local CMAKE_USE_DIR="${S}"
669 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
670 - DESTDIR="${ED}" emake VERBOSE=1 install
671 - popd >/dev/null || die
672 -
673 - python_optimize
674 -}
675 -
676 -src_install() {
677 - cmake-utils_src_install
678 - python_foreach_impl python_install
679 -
680 - find "${ED}" -name '*.la' -type f -delete || die
681 -
682 - exeinto /usr/$(get_libdir)/ceph
683 - newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
684 -
685 - insinto /etc/logrotate.d/
686 - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
687 -
688 - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
689 -
690 - fowners -R ceph:ceph /var/log/ceph
691 -
692 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
693 - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
694 - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
695 -
696 - insinto /etc/sysctl.d
697 - newins "${FILESDIR}"/sysctld 90-${PN}.conf
698 -
699 - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
700 -
701 - # units aren't installed by the build system unless systemd is enabled
702 - # so no point installing these with the USE flag disabled
703 - if use systemd; then
704 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
705 - "ceph-mds@.service"
706 -
707 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
708 - "ceph-osd@.service"
709 - fi
710 -
711 - udev_dorules udev/*.rules
712 -
713 - readme.gentoo_create_doc
714 -
715 - python_setup 'python3*'
716 -
717 - # bug #630232
718 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
719 - || die "sed failed"
720 -
721 - python_fix_shebang "${ED}"/usr/{,s}bin/
722 -
723 - # python_fix_shebang apparently is not idempotent
724 - local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
725 - grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
726 - | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die
727 -
728 - local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
729 - dostrip -x "${rados_classes[@]#${ED}}"
730 -}
731 -
732 -pkg_postinst() {
733 - readme.gentoo_print_elog
734 -}
735
736 diff --git a/sys-cluster/ceph/ceph-14.2.8.ebuild b/sys-cluster/ceph/ceph-14.2.8.ebuild
737 deleted file mode 100644
738 index 95abd364b0f..00000000000
739 --- a/sys-cluster/ceph/ceph-14.2.8.ebuild
740 +++ /dev/null
741 @@ -1,368 +0,0 @@
742 -# Copyright 1999-2020 Gentoo Authors
743 -# Distributed under the terms of the GNU General Public License v2
744 -
745 -EAPI=7
746 -PYTHON_COMPAT=( python3_{6,7} )
747 -CMAKE_MAKEFILE_GENERATOR=emake
748 -
749 -DISTUTILS_OPTIONAL=1
750 -
751 -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
752 - multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
753 - systemd
754 -
755 -if [[ ${PV} == *9999* ]]; then
756 - inherit git-r3
757 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
758 - SRC_URI=""
759 -else
760 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
761 - KEYWORDS="~amd64 ~ppc64"
762 -fi
763 -
764 -DESCRIPTION="Ceph distributed filesystem"
765 -HOMEPAGE="https://ceph.com/"
766 -
767 -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
768 -SLOT="0"
769 -
770 -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
771 -
772 -IUSE="babeltrace +cephfs custom-cflags dpdk fuse grafana jemalloc kerberos ldap"
773 -IUSE+=" libressl lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs"
774 -IUSE+=" system-boost systemd +tcmalloc test xfs zfs"
775 -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
776 -
777 -COMMON_DEPEND="
778 - acct-group/ceph
779 - acct-user/ceph
780 - virtual/libudev:=
781 - app-arch/bzip2:=[static-libs?]
782 - app-arch/lz4:=[static-libs?]
783 - app-arch/snappy:=[static-libs(-)?]
784 - app-arch/zstd:=[static-libs?]
785 - app-shells/bash:0
786 - app-misc/jq:=[static-libs?]
787 - dev-libs/crypto++:=[static-libs?]
788 - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
789 - dev-libs/libaio:=[static-libs?]
790 - dev-libs/libnl:3=[static-libs?]
791 - dev-libs/libxml2:=[static-libs?]
792 - dev-libs/nss:=
793 - sys-auth/oath-toolkit:=
794 - sys-apps/coreutils
795 - sys-apps/grep
796 - sys-apps/keyutils:=[static-libs?]
797 - sys-apps/util-linux:=[static-libs?]
798 - sys-apps/sed
799 - sys-apps/util-linux
800 - sys-libs/libcap-ng:=[static-libs?]
801 - sys-libs/ncurses:0=[static-libs?]
802 - sys-libs/zlib:=[static-libs?]
803 - babeltrace? ( dev-util/babeltrace )
804 - ldap? ( net-nds/openldap:=[static-libs?] )
805 - lttng? ( dev-util/lttng-ust:= )
806 - fuse? ( sys-fs/fuse:0=[static-libs?] )
807 - kerberos? ( virtual/krb5 )
808 - rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
809 - ssl? (
810 - !libressl? ( dev-libs/openssl:=[static-libs?] )
811 - libressl? ( dev-libs/libressl:=[static-libs?] )
812 - )
813 - xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
814 - zfs? ( sys-fs/zfs:=[static-libs?] )
815 - radosgw? (
816 - dev-libs/expat:=[static-libs?]
817 - !libressl? (
818 - dev-libs/openssl:=[static-libs?]
819 - net-misc/curl:=[curl_ssl_openssl,static-libs?]
820 - )
821 - libressl? (
822 - dev-libs/libressl:=[static-libs?]
823 - net-misc/curl:=[curl_ssl_libressl,static-libs?]
824 - )
825 - )
826 - system-boost? ( =dev-libs/boost-1.72*[threads,context,python,static-libs?,${PYTHON_USEDEP}] )
827 - jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
828 - !jemalloc? ( >=dev-util/google-perftools-2.6.1:=[static-libs?] )
829 - ${PYTHON_DEPS}
830 -"
831 -BDEPEND="
832 - amd64? ( dev-lang/yasm )
833 - x86? ( dev-lang/yasm )
834 - app-arch/cpio
835 - >=dev-util/cmake-3.5.0
836 - dev-python/cython[${PYTHON_USEDEP}]
837 - dev-python/sphinx
838 - dev-util/cunit
839 - dev-util/gperf
840 - dev-util/valgrind
841 - sys-apps/coreutils
842 - sys-apps/findutils
843 - sys-apps/grep
844 - sys-apps/sed
845 - sys-apps/which
846 - sys-devel/bc
847 - sys-devel/patch
848 - virtual/pkgconfig
849 - test? (
850 - dev-python/coverage[${PYTHON_USEDEP}]
851 - dev-python/virtualenv[${PYTHON_USEDEP}]
852 - dev-python/requests-mock[${PYTHON_USEDEP}]
853 - sys-apps/grep[pcre]
854 - sys-fs/btrfs-progs
855 - )
856 -"
857 -RDEPEND="${COMMON_DEPEND}
858 - net-misc/socat
859 - sys-apps/gptfdisk
860 - sys-block/parted
861 - sys-fs/cryptsetup
862 - sys-fs/lvm2[-device-mapper-only(-)]
863 - sys-fs/lsscsi
864 - virtual/awk
865 - dev-python/bcrypt[${PYTHON_USEDEP}]
866 - dev-python/cherrypy[${PYTHON_USEDEP}]
867 - dev-python/flask[${PYTHON_USEDEP}]
868 - dev-python/jinja[${PYTHON_USEDEP}]
869 - dev-python/pecan[${PYTHON_USEDEP}]
870 - dev-python/prettytable[${PYTHON_USEDEP}]
871 - dev-python/pyopenssl[${PYTHON_USEDEP}]
872 - dev-python/requests[${PYTHON_USEDEP}]
873 - dev-python/werkzeug[${PYTHON_USEDEP}]
874 - mgr? (
875 - dev-python/more-itertools[${PYTHON_USEDEP}]
876 - dev-python/pyjwt[${PYTHON_USEDEP}]
877 - dev-python/pyyaml[${PYTHON_USEDEP}]
878 - dev-python/routes[${PYTHON_USEDEP}]
879 - dev-python/six[${PYTHON_USEDEP}]
880 - )
881 -"
882 -REQUIRED_USE="
883 - ${PYTHON_REQUIRED_USE}
884 - mgr? ( cephfs )
885 - ?? ( jemalloc tcmalloc )
886 - rabbitmq? ( radosgw )
887 -"
888 -
889 -# the tests need root access
890 -RESTRICT="test? ( userpriv )"
891 -
892 -# distribution tarball does not include everything needed for tests
893 -RESTRICT+=" test"
894 -
895 -# false positives unless all USE flags are on
896 -CMAKE_WARN_UNUSED_CLI="no"
897 -
898 -PATCHES=(
899 - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
900 - "${FILESDIR}/ceph-14.2.0-cflags.patch"
901 - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
902 - "${FILESDIR}/ceph-13.2.0-cflags.patch"
903 - "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
904 - "${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
905 - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
906 - "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
907 - "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
908 - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
909 - "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
910 - "${FILESDIR}/ceph-14.2.4-python-executable.patch"
911 - "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
912 -)
913 -
914 -check-reqs_export_vars() {
915 - if use amd64; then
916 - CHECKREQS_DISK_BUILD="12G"
917 - CHECKREQS_DISK_USR="460M"
918 - else
919 - CHECKREQS_DISK_BUILD="1400M"
920 - CHECKREQS_DISK_USR="450M"
921 - fi
922 -
923 - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
924 -}
925 -
926 -pkg_pretend() {
927 - check-reqs_export_vars
928 - check-reqs_pkg_pretend
929 -}
930 -
931 -pkg_setup() {
932 - python_setup 'python3*'
933 - check-reqs_export_vars
934 - check-reqs_pkg_setup
935 -}
936 -
937 -src_prepare() {
938 - cmake-utils_src_prepare
939 -
940 - if use system-boost; then
941 - eapply "${FILESDIR}/ceph-14.2.8-boost-sonames.patch"
942 -
943 - find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
944 - | xargs --null sed \
945 - -e 's|Boost::|Boost_|g' \
946 - -e 's|Boost_boost|boost_system|g' -i || die
947 - fi
948 -
949 - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
950 - src/bash_completion/CMakeLists.txt || die
951 -
952 - # remove tests that need root access
953 - rm src/test/cli/ceph-authtool/cap*.t || die
954 -}
955 -
956 -ceph_src_configure() {
957 - local flag
958 - local mycmakeargs=(
959 - -DWITH_BABELTRACE=$(usex babeltrace)
960 - -DWITH_CEPHFS=$(usex cephfs)
961 - -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
962 - -DWITH_DPDK=$(usex dpdk)
963 - -DWITH_DPDK=$(usex spdk)
964 - -DWITH_FUSE=$(usex fuse)
965 - -DWITH_LTTNG=$(usex lttng)
966 - -DWITH_GSSAPI=$(usex kerberos)
967 - -DWITH_GRAFANA=$(usex grafana)
968 - -DWITH_MGR=$(usex mgr)
969 - -DWITH_MGR_DASHBOARD_FRONTEND=NO
970 - -DWITH_NUMA=$(usex numa)
971 - -DWITH_OPENLDAP=$(usex ldap)
972 - -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
973 - -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
974 - -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
975 - -DWITH_RADOSGW=$(usex radosgw)
976 - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
977 - -DWITH_SSL=$(usex ssl)
978 - -DWITH_SYSTEMD=$(usex systemd)
979 - -DWITH_TESTS=$(usex test)
980 - -DWITH_XFS=$(usex xfs)
981 - -DWITH_ZFS=$(usex zfs)
982 - -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
983 - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
984 - -DWITH_SYSTEM_BOOST=$(usex system-boost)
985 - -DBOOST_J=$(makeopts_jobs)
986 - -DWITH_RDMA=no
987 - -DWITH_TBB=no
988 - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
989 - -DEPYTHON_VERSION="${EPYTHON#python}"
990 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
991 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
992 - #-Wno-dev
993 - )
994 - if use amd64 || use x86; then
995 - for flag in ${CPU_FLAGS_X86[@]}; do
996 - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
997 - done
998 - fi
999 -
1000 - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
1001 - || die "failed to remove cmake cache"
1002 -
1003 - cmake-utils_src_configure
1004 -
1005 - # bug #630232
1006 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
1007 - "${BUILD_DIR:-${S}}"/include/acconfig.h \
1008 - || die "sed failed"
1009 -}
1010 -
1011 -src_configure() {
1012 - use custom-cflags || strip-flags
1013 - ceph_src_configure
1014 -}
1015 -
1016 -python_compile() {
1017 - local CMAKE_USE_DIR="${S}"
1018 - ceph_src_configure
1019 -
1020 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
1021 - emake VERBOSE=1 clean
1022 - emake VERBOSE=1 all
1023 -
1024 - # python modules are only compiled with "make install" so we need to do this to
1025 - # prevent doing a bunch of compilation in src_install
1026 - DESTDIR="${T}" emake VERBOSE=1 install
1027 - popd >/dev/null || die
1028 -}
1029 -
1030 -src_compile() {
1031 - cmake-utils_src_make VERBOSE=1 all
1032 -
1033 - # we have to do this here to prevent from building everything multiple times
1034 - python_copy_sources
1035 - python_foreach_impl python_compile
1036 -}
1037 -
1038 -src_test() {
1039 - make check || die "make check failed"
1040 -}
1041 -
1042 -python_install() {
1043 - local CMAKE_USE_DIR="${S}"
1044 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
1045 - DESTDIR="${ED}" emake VERBOSE=1 install
1046 - popd >/dev/null || die
1047 -
1048 - python_optimize
1049 -}
1050 -
1051 -src_install() {
1052 - cmake-utils_src_install
1053 - python_foreach_impl python_install
1054 -
1055 - find "${ED}" -name '*.la' -type f -delete || die
1056 -
1057 - exeinto /usr/$(get_libdir)/ceph
1058 - newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
1059 -
1060 - insinto /etc/logrotate.d/
1061 - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
1062 -
1063 - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
1064 -
1065 - fowners -R ceph:ceph /var/log/ceph
1066 -
1067 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
1068 - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
1069 - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
1070 -
1071 - insinto /etc/sysctl.d
1072 - newins "${FILESDIR}"/sysctld 90-${PN}.conf
1073 -
1074 - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
1075 -
1076 - # units aren't installed by the build system unless systemd is enabled
1077 - # so no point installing these with the USE flag disabled
1078 - if use systemd; then
1079 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
1080 - "ceph-mds@.service"
1081 -
1082 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
1083 - "ceph-osd@.service"
1084 - fi
1085 -
1086 - udev_dorules udev/*.rules
1087 -
1088 - readme.gentoo_create_doc
1089 -
1090 - python_setup 'python3*'
1091 -
1092 - # bug #630232
1093 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
1094 - || die "sed failed"
1095 -
1096 - python_fix_shebang "${ED}"/usr/{,s}bin/
1097 -
1098 - # python_fix_shebang apparently is not idempotent
1099 - local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
1100 - grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
1101 - | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die
1102 -
1103 - local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
1104 - dostrip -x "${rados_classes[@]#${ED}}"
1105 -}
1106 -
1107 -pkg_postinst() {
1108 - readme.gentoo_print_elog
1109 -}
1110
1111 diff --git a/sys-cluster/ceph/ceph-14.2.9.ebuild b/sys-cluster/ceph/ceph-14.2.9.ebuild
1112 deleted file mode 100644
1113 index 75b01167a71..00000000000
1114 --- a/sys-cluster/ceph/ceph-14.2.9.ebuild
1115 +++ /dev/null
1116 @@ -1,366 +0,0 @@
1117 -# Copyright 1999-2020 Gentoo Authors
1118 -# Distributed under the terms of the GNU General Public License v2
1119 -
1120 -EAPI=7
1121 -PYTHON_COMPAT=( python3_{6,7} )
1122 -CMAKE_MAKEFILE_GENERATOR=emake
1123 -
1124 -DISTUTILS_OPTIONAL=1
1125 -
1126 -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
1127 - multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
1128 - systemd
1129 -
1130 -if [[ ${PV} == *9999* ]]; then
1131 - inherit git-r3
1132 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
1133 - SRC_URI=""
1134 -else
1135 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
1136 - KEYWORDS="~amd64 ~ppc64"
1137 -fi
1138 -
1139 -DESCRIPTION="Ceph distributed filesystem"
1140 -HOMEPAGE="https://ceph.com/"
1141 -
1142 -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain"
1143 -SLOT="0"
1144 -
1145 -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
1146 -
1147 -IUSE="babeltrace +cephfs custom-cflags dpdk fuse grafana jemalloc kerberos ldap"
1148 -IUSE+=" libressl lttng +mgr numa rabbitmq +radosgw +ssl spdk static-libs"
1149 -IUSE+=" system-boost systemd +tcmalloc test xfs zfs"
1150 -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
1151 -
1152 -COMMON_DEPEND="
1153 - acct-group/ceph
1154 - acct-user/ceph
1155 - virtual/libudev:=
1156 - app-arch/bzip2:=[static-libs?]
1157 - app-arch/lz4:=[static-libs?]
1158 - app-arch/snappy:=[static-libs(-)?]
1159 - app-arch/zstd:=[static-libs?]
1160 - app-shells/bash:0
1161 - app-misc/jq:=[static-libs?]
1162 - dev-libs/crypto++:=[static-libs?]
1163 - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
1164 - dev-libs/libaio:=[static-libs?]
1165 - dev-libs/libnl:3=[static-libs?]
1166 - dev-libs/libxml2:=[static-libs?]
1167 - dev-libs/nss:=
1168 - sys-auth/oath-toolkit:=
1169 - sys-apps/coreutils
1170 - sys-apps/grep
1171 - sys-apps/keyutils:=[static-libs?]
1172 - sys-apps/util-linux:=[static-libs?]
1173 - sys-apps/sed
1174 - sys-apps/util-linux
1175 - sys-libs/libcap-ng:=[static-libs?]
1176 - sys-libs/ncurses:0=[static-libs?]
1177 - sys-libs/zlib:=[static-libs?]
1178 - babeltrace? ( dev-util/babeltrace )
1179 - ldap? ( net-nds/openldap:=[static-libs?] )
1180 - lttng? ( dev-util/lttng-ust:= )
1181 - fuse? ( sys-fs/fuse:0=[static-libs?] )
1182 - kerberos? ( virtual/krb5 )
1183 - rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
1184 - ssl? (
1185 - !libressl? ( dev-libs/openssl:=[static-libs?] )
1186 - libressl? ( dev-libs/libressl:=[static-libs?] )
1187 - )
1188 - xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
1189 - zfs? ( sys-fs/zfs:=[static-libs?] )
1190 - radosgw? (
1191 - dev-libs/expat:=[static-libs?]
1192 - !libressl? (
1193 - dev-libs/openssl:=[static-libs?]
1194 - net-misc/curl:=[curl_ssl_openssl,static-libs?]
1195 - )
1196 - libressl? (
1197 - dev-libs/libressl:=[static-libs?]
1198 - net-misc/curl:=[curl_ssl_libressl,static-libs?]
1199 - )
1200 - )
1201 - system-boost? ( =dev-libs/boost-1.72*[threads,context,python,static-libs?,${PYTHON_USEDEP}] )
1202 - jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
1203 - !jemalloc? ( >=dev-util/google-perftools-2.6.1:=[static-libs?] )
1204 - ${PYTHON_DEPS}
1205 -"
1206 -BDEPEND="
1207 - amd64? ( dev-lang/yasm )
1208 - x86? ( dev-lang/yasm )
1209 - app-arch/cpio
1210 - >=dev-util/cmake-3.5.0
1211 - dev-python/cython[${PYTHON_USEDEP}]
1212 - dev-python/sphinx
1213 - dev-util/cunit
1214 - dev-util/gperf
1215 - dev-util/valgrind
1216 - sys-apps/coreutils
1217 - sys-apps/findutils
1218 - sys-apps/grep
1219 - sys-apps/sed
1220 - sys-apps/which
1221 - sys-devel/bc
1222 - sys-devel/patch
1223 - virtual/pkgconfig
1224 - test? (
1225 - dev-python/coverage[${PYTHON_USEDEP}]
1226 - dev-python/virtualenv[${PYTHON_USEDEP}]
1227 - dev-python/requests-mock[${PYTHON_USEDEP}]
1228 - sys-apps/grep[pcre]
1229 - sys-fs/btrfs-progs
1230 - )
1231 -"
1232 -RDEPEND="${COMMON_DEPEND}
1233 - net-misc/socat
1234 - sys-apps/gptfdisk
1235 - sys-block/parted
1236 - sys-fs/cryptsetup
1237 - sys-fs/lvm2[-device-mapper-only(-)]
1238 - sys-fs/lsscsi
1239 - virtual/awk
1240 - dev-python/bcrypt[${PYTHON_USEDEP}]
1241 - dev-python/cherrypy[${PYTHON_USEDEP}]
1242 - dev-python/flask[${PYTHON_USEDEP}]
1243 - dev-python/jinja[${PYTHON_USEDEP}]
1244 - dev-python/pecan[${PYTHON_USEDEP}]
1245 - dev-python/prettytable[${PYTHON_USEDEP}]
1246 - dev-python/pyopenssl[${PYTHON_USEDEP}]
1247 - dev-python/requests[${PYTHON_USEDEP}]
1248 - dev-python/werkzeug[${PYTHON_USEDEP}]
1249 - mgr? (
1250 - dev-python/more-itertools[${PYTHON_USEDEP}]
1251 - dev-python/pyjwt[${PYTHON_USEDEP}]
1252 - dev-python/pyyaml[${PYTHON_USEDEP}]
1253 - dev-python/routes[${PYTHON_USEDEP}]
1254 - dev-python/six[${PYTHON_USEDEP}]
1255 - )
1256 -"
1257 -REQUIRED_USE="
1258 - ${PYTHON_REQUIRED_USE}
1259 - mgr? ( cephfs )
1260 - ?? ( jemalloc tcmalloc )
1261 - rabbitmq? ( radosgw )
1262 -"
1263 -
1264 -# the tests need root access
1265 -RESTRICT="test? ( userpriv )"
1266 -
1267 -# distribution tarball does not include everything needed for tests
1268 -RESTRICT+=" test"
1269 -
1270 -# false positives unless all USE flags are on
1271 -CMAKE_WARN_UNUSED_CLI="no"
1272 -
1273 -PATCHES=(
1274 - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
1275 - "${FILESDIR}/ceph-14.2.0-cflags.patch"
1276 - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
1277 - "${FILESDIR}/ceph-13.2.0-cflags.patch"
1278 - "${FILESDIR}/ceph-14.2.0-mgr-python-version.patch"
1279 - "${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch"
1280 - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
1281 - "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
1282 - "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
1283 - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
1284 - "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch"
1285 - "${FILESDIR}/ceph-14.2.4-python-executable.patch"
1286 - "${FILESDIR}/ceph-14.2.4-undefined-behaviour.patch"
1287 -)
1288 -
1289 -check-reqs_export_vars() {
1290 - if use amd64; then
1291 - CHECKREQS_DISK_BUILD="12G"
1292 - CHECKREQS_DISK_USR="460M"
1293 - else
1294 - CHECKREQS_DISK_BUILD="1400M"
1295 - CHECKREQS_DISK_USR="450M"
1296 - fi
1297 -
1298 - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
1299 -}
1300 -
1301 -pkg_pretend() {
1302 - check-reqs_export_vars
1303 - check-reqs_pkg_pretend
1304 -}
1305 -
1306 -pkg_setup() {
1307 - python_setup 'python3*'
1308 - check-reqs_export_vars
1309 - check-reqs_pkg_setup
1310 -}
1311 -
1312 -src_prepare() {
1313 - cmake-utils_src_prepare
1314 -
1315 - if use system-boost; then
1316 - find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
1317 - | xargs --null sed \
1318 - -e 's|Boost::|boost_|g' \
1319 - -e 's|boost_boost|boost_system|g' -i || die
1320 - fi
1321 -
1322 - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
1323 - src/bash_completion/CMakeLists.txt || die
1324 -
1325 - # remove tests that need root access
1326 - rm src/test/cli/ceph-authtool/cap*.t || die
1327 -}
1328 -
1329 -ceph_src_configure() {
1330 - local flag
1331 - local mycmakeargs=(
1332 - -DWITH_BABELTRACE=$(usex babeltrace)
1333 - -DWITH_CEPHFS=$(usex cephfs)
1334 - -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi)
1335 - -DWITH_DPDK=$(usex dpdk)
1336 - -DWITH_DPDK=$(usex spdk)
1337 - -DWITH_FUSE=$(usex fuse)
1338 - -DWITH_LTTNG=$(usex lttng)
1339 - -DWITH_GSSAPI=$(usex kerberos)
1340 - -DWITH_GRAFANA=$(usex grafana)
1341 - -DWITH_MGR=$(usex mgr)
1342 - -DWITH_MGR_DASHBOARD_FRONTEND=NO
1343 - -DWITH_NUMA=$(usex numa)
1344 - -DWITH_OPENLDAP=$(usex ldap)
1345 - -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi)
1346 - -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi)
1347 - -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi)
1348 - -DWITH_RADOSGW=$(usex radosgw)
1349 - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
1350 - -DWITH_SSL=$(usex ssl)
1351 - -DWITH_SYSTEMD=$(usex systemd)
1352 - -DWITH_TESTS=$(usex test)
1353 - -DWITH_XFS=$(usex xfs)
1354 - -DWITH_ZFS=$(usex zfs)
1355 - -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
1356 - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
1357 - -DWITH_SYSTEM_BOOST=$(usex system-boost)
1358 - -DBOOST_J=$(makeopts_jobs)
1359 - -DWITH_RDMA=no
1360 - -DWITH_TBB=no
1361 - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
1362 - -DEPYTHON_VERSION="${EPYTHON#python}"
1363 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
1364 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
1365 - #-Wno-dev
1366 - )
1367 - if use amd64 || use x86; then
1368 - for flag in ${CPU_FLAGS_X86[@]}; do
1369 - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
1370 - done
1371 - fi
1372 -
1373 - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
1374 - || die "failed to remove cmake cache"
1375 -
1376 - cmake-utils_src_configure
1377 -
1378 - # bug #630232
1379 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
1380 - "${BUILD_DIR:-${S}}"/include/acconfig.h \
1381 - || die "sed failed"
1382 -}
1383 -
1384 -src_configure() {
1385 - use custom-cflags || strip-flags
1386 - ceph_src_configure
1387 -}
1388 -
1389 -python_compile() {
1390 - local CMAKE_USE_DIR="${S}"
1391 - ceph_src_configure
1392 -
1393 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
1394 - emake VERBOSE=1 clean
1395 - emake VERBOSE=1 all
1396 -
1397 - # python modules are only compiled with "make install" so we need to do this to
1398 - # prevent doing a bunch of compilation in src_install
1399 - DESTDIR="${T}" emake VERBOSE=1 install
1400 - popd >/dev/null || die
1401 -}
1402 -
1403 -src_compile() {
1404 - cmake-utils_src_make VERBOSE=1 all
1405 -
1406 - # we have to do this here to prevent from building everything multiple times
1407 - python_copy_sources
1408 - python_foreach_impl python_compile
1409 -}
1410 -
1411 -src_test() {
1412 - make check || die "make check failed"
1413 -}
1414 -
1415 -python_install() {
1416 - local CMAKE_USE_DIR="${S}"
1417 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
1418 - DESTDIR="${ED}" emake VERBOSE=1 install
1419 - popd >/dev/null || die
1420 -
1421 - python_optimize
1422 -}
1423 -
1424 -src_install() {
1425 - cmake-utils_src_install
1426 - python_foreach_impl python_install
1427 -
1428 - find "${ED}" -name '*.la' -type f -delete || die
1429 -
1430 - exeinto /usr/$(get_libdir)/ceph
1431 - newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
1432 -
1433 - insinto /etc/logrotate.d/
1434 - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
1435 -
1436 - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
1437 -
1438 - fowners -R ceph:ceph /var/log/ceph
1439 -
1440 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
1441 - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
1442 - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
1443 -
1444 - insinto /etc/sysctl.d
1445 - newins "${FILESDIR}"/sysctld 90-${PN}.conf
1446 -
1447 - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
1448 -
1449 - # units aren't installed by the build system unless systemd is enabled
1450 - # so no point installing these with the USE flag disabled
1451 - if use systemd; then
1452 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
1453 - "ceph-mds@.service"
1454 -
1455 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
1456 - "ceph-osd@.service"
1457 - fi
1458 -
1459 - udev_dorules udev/*.rules
1460 -
1461 - readme.gentoo_create_doc
1462 -
1463 - python_setup 'python3*'
1464 -
1465 - # bug #630232
1466 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
1467 - || die "sed failed"
1468 -
1469 - python_fix_shebang "${ED}"/usr/{,s}bin/
1470 -
1471 - # python_fix_shebang apparently is not idempotent
1472 - local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
1473 - grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
1474 - | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die
1475 -
1476 - local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
1477 - dostrip -x "${rados_classes[@]#${ED}}"
1478 -}
1479 -
1480 -pkg_postinst() {
1481 - readme.gentoo_print_elog
1482 -}
1483
1484 diff --git a/sys-cluster/ceph/ceph-15.2.1.ebuild b/sys-cluster/ceph/ceph-15.2.1.ebuild
1485 deleted file mode 100644
1486 index 08f7ccfa694..00000000000
1487 --- a/sys-cluster/ceph/ceph-15.2.1.ebuild
1488 +++ /dev/null
1489 @@ -1,389 +0,0 @@
1490 -# Copyright 1999-2020 Gentoo Authors
1491 -# Distributed under the terms of the GNU General Public License v2
1492 -
1493 -EAPI=7
1494 -PYTHON_COMPAT=( python3_{6,7,8} )
1495 -CMAKE_MAKEFILE_GENERATOR=emake
1496 -
1497 -DISTUTILS_OPTIONAL=1
1498 -
1499 -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \
1500 - multiprocessing python-r1 udev readme.gentoo-r1 toolchain-funcs \
1501 - systemd
1502 -
1503 -if [[ ${PV} == *9999* ]]; then
1504 - inherit git-r3
1505 - EGIT_REPO_URI="https://github.com/ceph/ceph.git"
1506 - SRC_URI=""
1507 -else
1508 - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz"
1509 - KEYWORDS="~amd64"
1510 -fi
1511 -
1512 -DESCRIPTION="Ceph distributed filesystem"
1513 -HOMEPAGE="https://ceph.com/"
1514 -
1515 -LICENSE="Apache-2.0 LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ LGPL-2.1 LGPL-3 GPL-3 BSD Boost-1.0 MIT public-domain"
1516 -SLOT="0"
1517 -
1518 -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3)
1519 -
1520 -IUSE="babeltrace +cephfs custom-cflags dpdk fuse grafana jemalloc kafka kerberos ldap
1521 - libressl lttng +mgr numa +openssl pmdk rabbitmq +radosgw rbd-rwl +ssl spdk static-libs
1522 - system-boost systemd +tcmalloc test uring xfs zfs"
1523 -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})"
1524 -
1525 -COMMON_DEPEND="
1526 - acct-group/ceph
1527 - acct-user/ceph
1528 - virtual/libudev:=
1529 - app-arch/bzip2:=[static-libs?]
1530 - app-arch/lz4:=[static-libs?]
1531 - app-arch/snappy:=[static-libs(-)?]
1532 - app-arch/zstd:=[static-libs?]
1533 - app-shells/bash:0
1534 - app-misc/jq:=[static-libs?]
1535 - dev-libs/crypto++:=[static-libs?]
1536 - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc(-)?]
1537 - dev-libs/libaio:=[static-libs?]
1538 - dev-libs/libfmt:=
1539 - dev-libs/libnl:3=[static-libs?]
1540 - dev-libs/libxml2:=[static-libs?]
1541 - dev-libs/xmlsec:=[!openssl?,!libressl?,static-libs?]
1542 - dev-cpp/yaml-cpp:=
1543 - dev-libs/nss:=
1544 - dev-libs/protobuf:=[static-libs?]
1545 - net-dns/c-ares:=[static-libs?]
1546 - net-libs/gnutls:=[static-libs?]
1547 - sys-auth/oath-toolkit:=
1548 - sys-apps/coreutils
1549 - sys-apps/grep
1550 - sys-apps/hwloc:=[static-libs?]
1551 - sys-apps/keyutils:=[static-libs?]
1552 - sys-apps/util-linux:=[static-libs?]
1553 - sys-apps/sed
1554 - sys-apps/util-linux
1555 - sys-libs/libcap-ng:=[static-libs?]
1556 - sys-libs/ncurses:0=[static-libs?]
1557 - sys-libs/zlib:=[static-libs?]
1558 - sys-process/numactl:=[static-libs?]
1559 - x11-libs/libpciaccess:=[static-libs?]
1560 - babeltrace? ( dev-util/babeltrace )
1561 - fuse? ( sys-fs/fuse:0=[static-libs?] )
1562 - jemalloc? ( dev-libs/jemalloc:=[static-libs?] )
1563 - !jemalloc? ( >=dev-util/google-perftools-2.6.1:=[static-libs?] )
1564 - kafka? ( dev-libs/librdkafka:=[static-libs?] )
1565 - kerberos? ( virtual/krb5 )
1566 - ldap? ( net-nds/openldap:=[static-libs?] )
1567 - lttng? ( dev-util/lttng-ust:= )
1568 - rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] )
1569 - radosgw? (
1570 - dev-libs/expat:=[static-libs?]
1571 - openssl? (
1572 - dev-libs/openssl:=[static-libs?]
1573 - net-misc/curl:=[curl_ssl_openssl,static-libs?]
1574 - )
1575 - libressl? (
1576 - dev-libs/libressl:=[static-libs?]
1577 - net-misc/curl:=[curl_ssl_libressl,static-libs?]
1578 - )
1579 - )
1580 - ssl? (
1581 - openssl? ( dev-libs/openssl:=[static-libs?] )
1582 - libressl? ( dev-libs/libressl:=[static-libs?] )
1583 - )
1584 - system-boost? ( =dev-libs/boost-1.72*[threads,context,python,static-libs?,${PYTHON_USEDEP}] )
1585 - uring? ( sys-libs/liburing:=[static-libs?] )
1586 - xfs? ( sys-fs/xfsprogs:=[static-libs(+)?] )
1587 - zfs? ( sys-fs/zfs:=[static-libs?] )
1588 - ${PYTHON_DEPS}
1589 -"
1590 -BDEPEND="
1591 - amd64? ( dev-lang/yasm )
1592 - x86? ( dev-lang/yasm )
1593 - app-arch/cpio
1594 - >=dev-util/cmake-3.5.0
1595 - dev-python/cython[${PYTHON_USEDEP}]
1596 - dev-python/sphinx
1597 - dev-util/cunit
1598 - dev-util/gperf
1599 - dev-util/ragel
1600 - dev-util/valgrind
1601 - sys-apps/coreutils
1602 - sys-apps/findutils
1603 - sys-apps/grep
1604 - sys-apps/sed
1605 - sys-apps/which
1606 - sys-devel/bc
1607 - sys-devel/patch
1608 - virtual/pkgconfig
1609 - test? (
1610 - dev-python/coverage[${PYTHON_USEDEP}]
1611 - dev-python/virtualenv[${PYTHON_USEDEP}]
1612 - dev-python/requests-mock[${PYTHON_USEDEP}]
1613 - sys-apps/grep[pcre]
1614 - sys-fs/btrfs-progs
1615 - )
1616 -"
1617 -RDEPEND="${COMMON_DEPEND}
1618 - app-admin/sudo
1619 - net-misc/socat
1620 - sys-apps/gptfdisk
1621 - sys-apps/nvme-cli
1622 - >=sys-apps/smartmontools-7.0
1623 - sys-block/parted
1624 - sys-fs/cryptsetup
1625 - sys-fs/lsscsi
1626 - sys-fs/lvm2[-device-mapper-only(-)]
1627 - virtual/awk
1628 - dev-python/bcrypt[${PYTHON_USEDEP}]
1629 - dev-python/cherrypy[${PYTHON_USEDEP}]
1630 - dev-python/python-dateutil[${PYTHON_USEDEP}]
1631 - dev-python/flask[${PYTHON_USEDEP}]
1632 - dev-python/jinja[${PYTHON_USEDEP}]
1633 - dev-python/pecan[${PYTHON_USEDEP}]
1634 - dev-python/prettytable[${PYTHON_USEDEP}]
1635 - dev-python/pyopenssl[${PYTHON_USEDEP}]
1636 - dev-python/requests[${PYTHON_USEDEP}]
1637 - dev-python/werkzeug[${PYTHON_USEDEP}]
1638 - mgr? (
1639 - dev-python/jsonpatch[${PYTHON_USEDEP}]
1640 - dev-python/more-itertools[${PYTHON_USEDEP}]
1641 - dev-python/numpy[${PYTHON_USEDEP}]
1642 - dev-python/pyjwt[${PYTHON_USEDEP}]
1643 - dev-python/pyyaml[${PYTHON_USEDEP}]
1644 - dev-python/routes[${PYTHON_USEDEP}]
1645 - sci-libs/scipy[${PYTHON_USEDEP}]
1646 - sci-libs/scikits_learn[${PYTHON_USEDEP}]
1647 - dev-python/six[${PYTHON_USEDEP}]
1648 - )
1649 -"
1650 -REQUIRED_USE="
1651 - ${PYTHON_REQUIRED_USE}
1652 - ^^ ( openssl libressl )
1653 - kafka? ( radosgw )
1654 - rabbitmq? ( radosgw )
1655 - mgr? ( cephfs )
1656 - ?? ( jemalloc tcmalloc )
1657 - rabbitmq? ( radosgw )
1658 -"
1659 -RESTRICT="!test? ( test )"
1660 -
1661 -# the tests need root access
1662 -RESTRICT="test? ( userpriv )"
1663 -
1664 -# distribution tarball does not include everything needed for tests
1665 -RESTRICT+=" test"
1666 -
1667 -# false positives unless all USE flags are on
1668 -CMAKE_WARN_UNUSED_CLI="no"
1669 -
1670 -PATCHES=(
1671 - "${FILESDIR}/ceph-12.2.0-use-provided-cpu-flag-values.patch"
1672 - "${FILESDIR}/ceph-14.2.0-cflags.patch"
1673 - "${FILESDIR}/ceph-12.2.4-boost-build-none-options.patch"
1674 - "${FILESDIR}/ceph-13.2.0-cflags.patch"
1675 - "${FILESDIR}/ceph-15.2.0-no-virtualenvs.patch"
1676 - "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch"
1677 - "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch"
1678 - "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch"
1679 - "${FILESDIR}/ceph-14.2.0-cython-0.29.patch"
1680 - "${FILESDIR}/ceph-15.2.0-rocksdb-cmake.patch"
1681 -)
1682 -
1683 -check-reqs_export_vars() {
1684 - if use amd64; then
1685 - CHECKREQS_DISK_BUILD="12G"
1686 - CHECKREQS_DISK_USR="460M"
1687 - else
1688 - CHECKREQS_DISK_BUILD="1400M"
1689 - CHECKREQS_DISK_USR="450M"
1690 - fi
1691 -
1692 - export CHECKREQS_DISK_BUILD CHECKREQS_DISK_USR
1693 -}
1694 -
1695 -pkg_pretend() {
1696 - check-reqs_export_vars
1697 - check-reqs_pkg_pretend
1698 -}
1699 -
1700 -pkg_setup() {
1701 - python_setup 'python3*'
1702 - check-reqs_export_vars
1703 - check-reqs_pkg_setup
1704 -}
1705 -
1706 -src_prepare() {
1707 - cmake-utils_src_prepare
1708 -
1709 - if use system-boost; then
1710 - find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
1711 - | xargs --null sed -r \
1712 - -e 's|Boost::|Boost_|g' \
1713 - -e 's|Boost_|boost_|g' \
1714 - -e 's|[Bb]oost_boost|boost_system|g' -i || die
1715 - fi
1716 -
1717 - sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \
1718 - src/bash_completion/CMakeLists.txt || die
1719 -
1720 - # remove tests that need root access
1721 - rm src/test/cli/ceph-authtool/cap*.t || die
1722 -}
1723 -
1724 -ceph_src_configure() {
1725 - local flag
1726 - local mycmakeargs=(
1727 - -DWITH_BABELTRACE=$(usex babeltrace)
1728 - -DWITH_BLUESTORE_PMEM=$(usex pmdk)
1729 - -DWITH_CEPHFS=$(usex cephfs)
1730 - -DWITH_CEPHFS_SHELL=$(usex cephfs)
1731 - -DWITH_DPDK=$(usex dpdk)
1732 - -DWITH_DPDK=$(usex spdk)
1733 - -DWITH_FUSE=$(usex fuse)
1734 - -DWITH_LTTNG=$(usex lttng)
1735 - -DWITH_GSSAPI=$(usex kerberos)
1736 - -DWITH_GRAFANA=$(usex grafana)
1737 - -DWITH_MGR=$(usex mgr)
1738 - -DWITH_MGR_DASHBOARD_FRONTEND=OFF
1739 - -DWITH_NUMA=$(usex numa)
1740 - -DWITH_OPENLDAP=$(usex ldap)
1741 - -DWITH_PYTHON3=3
1742 - -DWITH_RADOSGW=$(usex radosgw)
1743 - -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq)
1744 - -DWITH_RADOSGW_KAFKA_ENDPOINT=$(usex kafka)
1745 - -DWITH_RBD_RWL=$(usex rbd-rwl)
1746 - -DWITH_SSL=$(usex ssl)
1747 - -DWITH_SYSTEMD=$(usex systemd)
1748 - -DWITH_TESTS=$(usex test)
1749 - -DWITH_LIBURING=$(usex uring)
1750 - -DWITH_XFS=$(usex xfs)
1751 - -DWITH_ZFS=$(usex zfs)
1752 - -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF')
1753 - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')")
1754 - -DWITH_SYSTEM_BOOST=$(usex system-boost)
1755 - -DBOOST_J=$(makeopts_jobs)
1756 - -DWITH_RDMA=OFF
1757 - -DWITH_TBB=OFF
1758 - -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir)
1759 - -DEPYTHON_VERSION="${EPYTHON#python}"
1760 - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}"
1761 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
1762 - )
1763 - if use amd64 || use x86; then
1764 - for flag in ${CPU_FLAGS_X86[@]}; do
1765 - mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")")
1766 - done
1767 - fi
1768 -
1769 - rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \
1770 - || die "failed to remove cmake cache"
1771 -
1772 - cmake-utils_src_configure
1773 -
1774 - # bug #630232
1775 - sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \
1776 - "${BUILD_DIR:-${S}}"/include/acconfig.h \
1777 - || die "sed failed"
1778 -}
1779 -
1780 -src_configure() {
1781 - use custom-cflags || strip-flags
1782 - ceph_src_configure
1783 -}
1784 -
1785 -python_compile() {
1786 - local CMAKE_USE_DIR="${S}"
1787 - ceph_src_configure
1788 -
1789 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
1790 - emake VERBOSE=1 clean
1791 - emake VERBOSE=1 all
1792 -
1793 - # python modules are only compiled with "make install" so we need to do this to
1794 - # prevent doing a bunch of compilation in src_install
1795 - DESTDIR="${T}" emake VERBOSE=1 install
1796 - popd >/dev/null || die
1797 -}
1798 -
1799 -src_compile() {
1800 - cmake-utils_src_make VERBOSE=1 all
1801 -
1802 - # we have to do this here to prevent from building everything multiple times
1803 - python_copy_sources
1804 - python_foreach_impl python_compile
1805 -}
1806 -
1807 -src_test() {
1808 - make check || die "make check failed"
1809 -}
1810 -
1811 -python_install() {
1812 - local CMAKE_USE_DIR="${S}"
1813 - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die
1814 - DESTDIR="${ED}" emake VERBOSE=1 install
1815 - popd >/dev/null || die
1816 -
1817 - python_optimize
1818 -}
1819 -
1820 -src_install() {
1821 - cmake-utils_src_install
1822 - python_foreach_impl python_install
1823 -
1824 - find "${ED}" -name '*.la' -type f -delete || die
1825 -
1826 - exeinto /usr/$(get_libdir)/ceph
1827 - newexe "${BUILD_DIR}/bin/init-ceph" init-ceph
1828 -
1829 - insinto /etc/logrotate.d/
1830 - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN}
1831 -
1832 - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat
1833 -
1834 - fowners -R ceph:ceph /var/log/ceph
1835 -
1836 - newinitd "${FILESDIR}/rbdmap.initd" rbdmap
1837 - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
1838 - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
1839 -
1840 - insinto /etc/sysctl.d
1841 - newins "${FILESDIR}"/sysctld 90-${PN}.conf
1842 -
1843 - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc
1844 -
1845 - # units aren't installed by the build system unless systemd is enabled
1846 - # so no point installing these with the USE flag disabled
1847 - if use systemd; then
1848 - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \
1849 - "ceph-mds@.service"
1850 -
1851 - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \
1852 - "ceph-osd@.service"
1853 - fi
1854 -
1855 - udev_dorules udev/*.rules
1856 -
1857 - readme.gentoo_create_doc
1858 -
1859 - python_setup 'python3*'
1860 -
1861 - # bug #630232
1862 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \
1863 - || die "sed failed"
1864 -
1865 - python_fix_shebang "${ED}"/usr/{,s}bin/
1866 -
1867 - # python_fix_shebang apparently is not idempotent
1868 - local shebang_regex='(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]'
1869 - grep -r -E -l --null "${shebang_regex}" "${ED}"/usr/{s,}bin/ \
1870 - | xargs --null --no-run-if-empty -- sed -i -r "s:${shebang_regex}:\1:" || die
1871 -
1872 - local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* )
1873 - dostrip -x "${rados_classes[@]#${ED}}"
1874 -}
1875 -
1876 -pkg_postinst() {
1877 - readme.gentoo_print_elog
1878 -}
1879
1880 diff --git a/sys-cluster/ceph/files/ceph-14.2.8-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.8-boost-sonames.patch
1881 deleted file mode 100644
1882 index 07def706d78..00000000000
1883 --- a/sys-cluster/ceph/files/ceph-14.2.8-boost-sonames.patch
1884 +++ /dev/null
1885 @@ -1,538 +0,0 @@
1886 -diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake
1887 -index f99d74a0bc..d1a47bc5d1 100644
1888 ---- a/cmake/modules/BuildBoost.cmake
1889 -+++ b/cmake/modules/BuildBoost.cmake
1890 -@@ -199,13 +199,13 @@ macro(build_boost version)
1891 - foreach(c ${Boost_BUILD_COMPONENTS})
1892 - string(TOUPPER ${c} upper_c)
1893 - if(Boost_USE_STATIC_LIBS)
1894 -- add_library(Boost::${c} STATIC IMPORTED)
1895 -+ add_library(Boost_${c} STATIC IMPORTED)
1896 - else()
1897 -- add_library(Boost::${c} SHARED IMPORTED)
1898 -+ add_library(Boost_${c} SHARED IMPORTED)
1899 - endif()
1900 -- add_dependencies(Boost::${c} Boost)
1901 -+ add_dependencies(Boost_${c} Boost)
1902 - if(c MATCHES "^python")
1903 -- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
1904 -+ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
1905 - endif()
1906 - if(Boost_USE_STATIC_LIBS)
1907 - set(Boost_${upper_c}_LIBRARY
1908 -@@ -215,7 +215,7 @@ macro(build_boost version)
1909 - ${install_dir}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}boost_${c}${CMAKE_SHARED_LIBRARY_SUFFIX})
1910 - endif()
1911 - unset(buildid)
1912 -- set_target_properties(Boost::${c} PROPERTIES
1913 -+ set_target_properties(Boost_${c} PROPERTIES
1914 - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}"
1915 - IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
1916 - IMPORTED_LOCATION "${Boost_${upper_c}_LIBRARY}")
1917 -@@ -224,19 +224,19 @@ macro(build_boost version)
1918 - foreach(c ${Boost_BUILD_COMPONENTS})
1919 - if(Boost_${c}_DEPENDENCIES)
1920 - foreach(dep ${Boost_${c}_DEPENDENCIES})
1921 -- list(APPEND dependencies Boost::${dep})
1922 -+ list(APPEND dependencies Boost_${dep})
1923 - endforeach()
1924 -- set_target_properties(Boost::${c} PROPERTIES
1925 -+ set_target_properties(Boost_${c} PROPERTIES
1926 - INTERFACE_LINK_LIBRARIES "${dependencies}")
1927 - unset(dependencies)
1928 - endif()
1929 - endforeach()
1930 -
1931 - # for header-only libraries
1932 -- add_library(Boost::boost INTERFACE IMPORTED)
1933 -- set_target_properties(Boost::boost PROPERTIES
1934 -+ add_library(boost INTERFACE IMPORTED)
1935 -+ set_target_properties(boost PROPERTIES
1936 - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
1937 -- add_dependencies(Boost::boost Boost)
1938 -+ add_dependencies(boost Boost)
1939 - find_package_handle_standard_args(Boost DEFAULT_MSG
1940 - Boost_INCLUDE_DIRS Boost_LIBRARIES)
1941 - mark_as_advanced(Boost_LIBRARIES BOOST_INCLUDE_DIRS)
1942 -@@ -253,7 +253,7 @@ function(maybe_add_boost_dep target)
1943 - get_filename_component(ext ${src} EXT)
1944 - # assuming all cxx source files include boost header(s)
1945 - if(ext MATCHES ".cc|.cpp|.cxx")
1946 -- add_dependencies(${target} Boost::boost)
1947 -+ add_dependencies(${target} boost)
1948 - return()
1949 - endif()
1950 - endforeach()
1951 -diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
1952 -index bc61995b03..4419632fa4 100644
1953 ---- a/cmake/modules/FindBoost.cmake
1954 -+++ b/cmake/modules/FindBoost.cmake
1955 -@@ -293,9 +293,9 @@ function(_boost_get_canonical_target_name component target_var)
1956 - string(TOLOWER "${component}" component)
1957 - if(component MATCHES "^([a-z_]*)(python|numpy)([1-9])\\.?([0-9])?$")
1958 - # handle pythonXY and numpyXY versioned components and also python X.Y, mpi_python etc.
1959 -- set(${target_var} "Boost::${CMAKE_MATCH_1}${CMAKE_MATCH_2}" PARENT_SCOPE)
1960 -+ set(${target_var} "boost_${CMAKE_MATCH_1}${CMAKE_MATCH_2}" PARENT_SCOPE)
1961 - else()
1962 -- set(${target_var} "Boost::${component}" PARENT_SCOPE)
1963 -+ set(${target_var} "boost_${component}" PARENT_SCOPE)
1964 - endif()
1965 - endfunction()
1966 -
1967 -@@ -403,19 +403,19 @@ function(_boost_set_legacy_variables_from_config)
1968 - if(WIN32)
1969 - _boost_set_if_unset(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
1970 - endif()
1971 -- if(NOT TARGET Boost::headers)
1972 -- add_library(Boost::headers INTERFACE IMPORTED)
1973 -- target_include_directories(Boost::headers INTERFACE ${Boost_INCLUDE_DIRS})
1974 -+ if(NOT TARGET boost_headers)
1975 -+ add_library(boost_headers INTERFACE IMPORTED)
1976 -+ target_include_directories(boost_headers INTERFACE ${Boost_INCLUDE_DIRS})
1977 - endif()
1978 - # Legacy targets w/o functionality as all handled by defined targets
1979 - foreach(lib diagnostic_definitions disable_autolinking dynamic_linking)
1980 -- if(NOT TARGET Boost::${lib})
1981 -- add_library(Boost::${lib} INTERFACE IMPORTED)
1982 -+ if(NOT TARGET boost_${lib})
1983 -+ add_library(boost_${lib} INTERFACE IMPORTED)
1984 - endif()
1985 - endforeach()
1986 -- if(NOT TARGET Boost::boost)
1987 -- add_library(Boost::boost INTERFACE IMPORTED)
1988 -- target_link_libraries(Boost::boost INTERFACE Boost::headers)
1989 -+ if(NOT TARGET boost_boost)
1990 -+ add_library(boost_boost INTERFACE IMPORTED)
1991 -+ target_link_libraries(boost_boost INTERFACE boost_headers)
1992 - endif()
1993 - endfunction()
1994 -
1995 -@@ -580,10 +580,6 @@ macro(_Boost_ADJUST_LIB_VARS basename)
1996 -
1997 - if(Boost_${basename}_LIBRARY AND Boost_${basename}_HEADER)
1998 - set(Boost_${basename}_FOUND ON)
1999 -- if("x${basename}" STREQUAL "xTHREAD" AND NOT TARGET Threads::Threads)
2000 -- string(APPEND Boost_ERROR_REASON_THREAD " (missing dependency: Threads)")
2001 -- set(Boost_THREAD_FOUND OFF)
2002 -- endif()
2003 - endif()
2004 -
2005 - endif()
2006 -@@ -1170,7 +1166,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
2007 - if (NOT _boost_DEPS_STRING)
2008 - set(_boost_DEPS_STRING "(none)")
2009 - endif()
2010 -- # message(STATUS "Dependencies for Boost::${component}: ${_boost_DEPS_STRING}")
2011 -+ # message(STATUS "Dependencies for Boost_${component}: ${_boost_DEPS_STRING}")
2012 - endfunction()
2013 -
2014 - #
2015 -@@ -1254,7 +1250,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
2016 - if (NOT _boost_HDRS_STRING)
2017 - set(_boost_HDRS_STRING "(none)")
2018 - endif()
2019 -- # message(STATUS "Headers for Boost::${component}: ${_boost_HDRS_STRING}")
2020 -+ # message(STATUS "Headers for Boost_${component}: ${_boost_HDRS_STRING}")
2021 - endfunction()
2022 -
2023 - #
2024 -@@ -1302,7 +1298,7 @@ endfunction()
2025 -
2026 - #
2027 - # Some boost libraries may require particular set of compler features.
2028 --# The very first one was `boost::fiber` introduced in Boost 1.62.
2029 -+# The very first one was `boost_fiber` introduced in Boost 1.62.
2030 - # One can check required compiler features of it in
2031 - # - `${Boost_ROOT}/libs/fiber/build/Jamfile.v2`;
2032 - # - `${Boost_ROOT}/libs/context/build/Jamfile.v2`.
2033 -@@ -1472,11 +1468,11 @@ _Boost_DEBUG_PRINT_VAR("${CMAKE_CURRENT_LIST_FILE}" "${CMAKE_CURRENT_LIST_LINE}"
2034 - # on all platforms to keep end user code free from platform dependent
2035 - # code. Also provide convenience targets to disable autolinking and
2036 - # enable dynamic linking.
2037 --if(NOT TARGET Boost::diagnostic_definitions)
2038 -- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED)
2039 -- add_library(Boost::disable_autolinking INTERFACE IMPORTED)
2040 -- add_library(Boost::dynamic_linking INTERFACE IMPORTED)
2041 -- set_target_properties(Boost::dynamic_linking PROPERTIES
2042 -+if(NOT TARGET boost_diagnostic_definitions)
2043 -+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED)
2044 -+ add_library(boost_disable_autolinking INTERFACE IMPORTED)
2045 -+ add_library(boost_dynamic_linking INTERFACE IMPORTED)
2046 -+ set_target_properties(boost_dynamic_linking PROPERTIES
2047 - INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK")
2048 - endif()
2049 - if(WIN32)
2050 -@@ -1498,9 +1494,9 @@ if(WIN32)
2051 - # code to emit a #pragma message each time a library is selected
2052 - # for linking.
2053 - set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC")
2054 -- set_target_properties(Boost::diagnostic_definitions PROPERTIES
2055 -+ set_target_properties(boost_diagnostic_definitions PROPERTIES
2056 - INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC")
2057 -- set_target_properties(Boost::disable_autolinking PROPERTIES
2058 -+ set_target_properties(boost_disable_autolinking PROPERTIES
2059 - INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB")
2060 - endif()
2061 -
2062 -@@ -1933,7 +1929,7 @@ if("thread" IN_LIST Boost_FIND_COMPONENTS)
2063 - else()
2064 - set(_Boost_find_quiet "")
2065 - endif()
2066 -- find_package(Threads ${_Boost_find_quiet})
2067 -+ find_package(boost_thread ${_Boost_find_quiet})
2068 - unset(_Boost_find_quiet)
2069 - endif()
2070 -
2071 -@@ -2234,69 +2230,69 @@ endif()
2072 - if(Boost_FOUND)
2073 - # The builtin CMake package in Boost 1.70+ introduces a new name
2074 - # for the header-only lib, let's provide the same UI in module mode
2075 -- if(NOT TARGET Boost::headers)
2076 -- add_library(Boost::headers INTERFACE IMPORTED)
2077 -+ if(NOT TARGET boost_headers)
2078 -+ add_library(boost_headers INTERFACE IMPORTED)
2079 - if(Boost_INCLUDE_DIRS)
2080 -- set_target_properties(Boost::headers PROPERTIES
2081 -+ set_target_properties(boost_headers PROPERTIES
2082 - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
2083 - endif()
2084 - endif()
2085 -
2086 - # Define the old target name for header-only libraries for backwards
2087 - # compat.
2088 -- if(NOT TARGET Boost::boost)
2089 -- add_library(Boost::boost INTERFACE IMPORTED)
2090 -- set_target_properties(Boost::boost
2091 -- PROPERTIES INTERFACE_LINK_LIBRARIES Boost::headers)
2092 -+ if(NOT TARGET boost_boost)
2093 -+ add_library(boost_boost INTERFACE IMPORTED)
2094 -+ set_target_properties(boost_boost
2095 -+ PROPERTIES INTERFACE_LINK_LIBRARIES boost_headers)
2096 - endif()
2097 -
2098 - foreach(COMPONENT ${Boost_FIND_COMPONENTS})
2099 -- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT})
2100 -+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT})
2101 - string(TOUPPER ${COMPONENT} UPPERCOMPONENT)
2102 - if(Boost_${UPPERCOMPONENT}_FOUND)
2103 - if(Boost_USE_STATIC_LIBS)
2104 -- add_library(Boost::${COMPONENT} STATIC IMPORTED)
2105 -+ add_library(boost_${COMPONENT} STATIC IMPORTED)
2106 - else()
2107 - # Even if Boost_USE_STATIC_LIBS is OFF, we might have static
2108 - # libraries as a result.
2109 -- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED)
2110 -+ add_library(boost_${COMPONENT} UNKNOWN IMPORTED)
2111 - endif()
2112 - if(Boost_INCLUDE_DIRS)
2113 -- set_target_properties(Boost::${COMPONENT} PROPERTIES
2114 -+ set_target_properties(boost_${COMPONENT} PROPERTIES
2115 - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}")
2116 - endif()
2117 - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}")
2118 -- set_target_properties(Boost::${COMPONENT} PROPERTIES
2119 -+ set_target_properties(boost_${COMPONENT} PROPERTIES
2120 - IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
2121 - IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}")
2122 - endif()
2123 - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
2124 -- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
2125 -+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
2126 - IMPORTED_CONFIGURATIONS RELEASE)
2127 -- set_target_properties(Boost::${COMPONENT} PROPERTIES
2128 -+ set_target_properties(boost_${COMPONENT} PROPERTIES
2129 - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX"
2130 - IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}")
2131 - endif()
2132 - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
2133 -- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY
2134 -+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY
2135 - IMPORTED_CONFIGURATIONS DEBUG)
2136 -- set_target_properties(Boost::${COMPONENT} PROPERTIES
2137 -+ set_target_properties(boost_${COMPONENT} PROPERTIES
2138 - IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
2139 - IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}")
2140 - endif()
2141 - if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES)
2142 - unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES)
2143 - foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES})
2144 -- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep})
2145 -+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep})
2146 - endforeach()
2147 - if(COMPONENT STREQUAL "thread")
2148 - list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads)
2149 - endif()
2150 -- set_target_properties(Boost::${COMPONENT} PROPERTIES
2151 -+ set_target_properties(boost_${COMPONENT} PROPERTIES
2152 - INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}")
2153 - endif()
2154 - if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES)
2155 -- set_target_properties(Boost::${COMPONENT} PROPERTIES
2156 -+ set_target_properties(boost_${COMPONENT} PROPERTIES
2157 - CXX_STANDARD 17)
2158 - endif()
2159 - endif()
2160 -diff --git a/cmake/modules/Finddpdk.cmake b/cmake/modules/Finddpdk.cmake
2161 -index 964ae5dfb0..92bf07c14e 100644
2162 ---- a/cmake/modules/Finddpdk.cmake
2163 -+++ b/cmake/modules/Finddpdk.cmake
2164 -@@ -102,9 +102,9 @@ if(dpdk_FOUND)
2165 -
2166 - if(NOT TARGET dpdk::dpdk)
2167 - add_library(dpdk::dpdk INTERFACE IMPORTED)
2168 -- find_package(Threads QUIET)
2169 -+ find_package(boost_thread QUIET)
2170 - list(APPEND dpdk_LIBRARIES
2171 -- Threads::Threads
2172 -+ boost_thread
2173 - dpdk::cflags)
2174 - set_target_properties(dpdk::dpdk PROPERTIES
2175 - INTERFACE_LINK_LIBRARIES "${dpdk_LIBRARIES}"
2176 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
2177 -index 28ec9835f8..31a1efa19f 100644
2178 ---- a/src/CMakeLists.txt
2179 -+++ b/src/CMakeLists.txt
2180 -@@ -356,12 +356,12 @@ set(ceph_common_objs
2181 - set(ceph_common_deps
2182 - json_spirit erasure_code arch crc32
2183 - ${LIB_RESOLV}
2184 -- Boost::thread
2185 -- Boost::system
2186 -- Boost::random
2187 -- Boost::program_options
2188 -- Boost::date_time
2189 -- Boost::iostreams
2190 -+ boost_thread
2191 -+ boost_system
2192 -+ boost_random
2193 -+ boost_program_options
2194 -+ boost_date_time
2195 -+ boost_iostreams
2196 - ${BLKID_LIBRARIES}
2197 - ${Backtrace_LIBRARIES}
2198 - ${BLKIN_LIBRARIES}
2199 -@@ -522,7 +522,7 @@ if (WITH_CEPHFS)
2200 - ceph_mds.cc)
2201 - add_executable(ceph-mds ${ceph_mds_srcs})
2202 - target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common
2203 -- Boost::thread)
2204 -+ boost_thread)
2205 - install(TARGETS ceph-mds DESTINATION bin)
2206 - endif()
2207 -
2208 -diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
2209 -index d7b58521d4..e1533af33f 100644
2210 ---- a/src/crimson/CMakeLists.txt
2211 -+++ b/src/crimson/CMakeLists.txt
2212 -@@ -106,8 +106,8 @@ target_link_libraries(crimson-common
2213 - PRIVATE
2214 - crc32
2215 - crimson::cflags
2216 -- Boost::iostreams
2217 -- Boost::random
2218 -+ boost_iostreams
2219 -+ boost_random
2220 - ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto)
2221 -
2222 - set(crimson_auth_srcs
2223 -diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt
2224 -index 180e39bc1c..8323aa29a5 100644
2225 ---- a/src/mgr/CMakeLists.txt
2226 -+++ b/src/mgr/CMakeLists.txt
2227 -@@ -30,7 +30,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
2228 - target_link_libraries(ceph-mgr
2229 - osdc client heap_profiler
2230 - global-static ceph-common
2231 -- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
2232 -+ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
2233 - ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES})
2234 - set_target_properties(ceph-mgr PROPERTIES
2235 - POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE})
2236 -diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt
2237 -index e9d3804c5f..5c6eb58de1 100644
2238 ---- a/src/rbd_replay/CMakeLists.txt
2239 -+++ b/src/rbd_replay/CMakeLists.txt
2240 -@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE)
2241 - global
2242 - babeltrace
2243 - babeltrace-ctf
2244 -- Boost::date_time
2245 -+ boost_date_time
2246 - )
2247 - install(TARGETS rbd-replay-prep DESTINATION bin)
2248 - endif(HAVE_BABELTRACE)
2249 -diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
2250 -index d184c783de..00740331e3 100644
2251 ---- a/src/rgw/CMakeLists.txt
2252 -+++ b/src/rgw/CMakeLists.txt
2253 -@@ -203,7 +203,7 @@ if(WITH_CURL_OPENSSL)
2254 - endif()
2255 -
2256 - if(WITH_BOOST_CONTEXT)
2257 -- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context)
2258 -+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context)
2259 - endif()
2260 -
2261 - set(rgw_libs rgw_a)
2262 -@@ -354,7 +354,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT)
2263 - target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ)
2264 - endif()
2265 - if(WITH_BOOST_CONTEXT)
2266 -- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context)
2267 -+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context)
2268 - endif()
2269 -
2270 - if(WITH_TESTS)
2271 -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
2272 -index 5dcee1694d..60743be698 100644
2273 ---- a/src/test/CMakeLists.txt
2274 -+++ b/src/test/CMakeLists.txt
2275 -@@ -159,7 +159,7 @@ add_executable(ceph_omapbench
2276 - )
2277 - target_link_libraries(ceph_omapbench
2278 - librados
2279 -- Boost::program_options
2280 -+ boost_program_options
2281 - global
2282 - ${BLKID_LIBRARIES}
2283 - ${CMAKE_DL_LIBS}
2284 -diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
2285 -index 71fb77cda9..aff8fb6565 100644
2286 ---- a/src/test/common/CMakeLists.txt
2287 -+++ b/src/test/common/CMakeLists.txt
2288 -@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject)
2289 -
2290 - add_executable(unittest_async_completion test_async_completion.cc)
2291 - add_ceph_unittest(unittest_async_completion)
2292 --target_link_libraries(unittest_async_completion Boost::system)
2293 -+target_link_libraries(unittest_async_completion boost_system)
2294 -
2295 - add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc)
2296 - add_ceph_unittest(unittest_async_shared_mutex)
2297 --target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system)
2298 -+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system)
2299 -diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt
2300 -index 721f6c3675..1cd9635c77 100644
2301 ---- a/src/test/erasure-code/CMakeLists.txt
2302 -+++ b/src/test/erasure-code/CMakeLists.txt
2303 -@@ -2,15 +2,15 @@
2304 - add_executable(ceph_erasure_code_benchmark
2305 - ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc
2306 - ceph_erasure_code_benchmark.cc)
2307 --target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
2308 -+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS})
2309 - install(TARGETS ceph_erasure_code_benchmark
2310 - DESTINATION bin)
2311 -
2312 - add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc)
2313 --target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
2314 -+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS})
2315 -
2316 - add_executable(ceph_erasure_code ceph_erasure_code.cc)
2317 --target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS})
2318 -+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS})
2319 - install(TARGETS ceph_erasure_code
2320 - DESTINATION bin)
2321 -
2322 -diff --git a/src/test/lazy-omap-stats/CMakeLists.txt b/src/test/lazy-omap-stats/CMakeLists.txt
2323 -index fad71f135c..06a3d2d929 100644
2324 ---- a/src/test/lazy-omap-stats/CMakeLists.txt
2325 -+++ b/src/test/lazy-omap-stats/CMakeLists.txt
2326 -@@ -4,7 +4,7 @@ add_executable(ceph_test_lazy_omap_stats
2327 - main.cc
2328 - lazy_omap_stats_test.cc)
2329 - target_link_libraries(ceph_test_lazy_omap_stats
2330 -- librados ${UNITTEST_LIBS} Boost::system)
2331 -+ librados ${UNITTEST_LIBS} boost_system)
2332 - install(TARGETS
2333 - ceph_test_lazy_omap_stats
2334 - DESTINATION ${CMAKE_INSTALL_BINDIR})
2335 -diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt
2336 -index 4fc53d2406..e6304394f8 100644
2337 ---- a/src/test/librados/CMakeLists.txt
2338 -+++ b/src/test/librados/CMakeLists.txt
2339 -@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc)
2340 - target_link_libraries(ceph_test_rados_api_asio global
2341 - librados ${UNITTEST_LIBS})
2342 - if(WITH_BOOST_CONTEXT)
2343 -- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context)
2344 -+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context)
2345 - endif()
2346 -
2347 - add_executable(ceph_test_rados_api_list
2348 -@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp
2349 - tier_cxx.cc
2350 - $<TARGET_OBJECTS:unit-main>)
2351 - target_link_libraries(ceph_test_rados_api_tier_pp
2352 -- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx)
2353 -+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx)
2354 -
2355 - add_executable(ceph_test_rados_api_snapshots
2356 - snapshots.cc)
2357 -diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt
2358 -index 3c3e9db6c1..2c208c1a4f 100644
2359 ---- a/src/test/librbd/CMakeLists.txt
2360 -+++ b/src/test/librbd/CMakeLists.txt
2361 -@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE
2362 - radostest
2363 - radostest-cxx
2364 - librados
2365 -- Boost::thread
2366 -+ boost_thread
2367 - GMock::GMock
2368 - GTest::GTest)
2369 -
2370 -diff --git a/src/test/mon/CMakeLists.txt b/src/test/mon/CMakeLists.txt
2371 -index b712e95be7..6225ff3320 100644
2372 ---- a/src/test/mon/CMakeLists.txt
2373 -+++ b/src/test/mon/CMakeLists.txt
2374 -@@ -44,7 +44,7 @@ target_link_libraries(unittest_mon_montypes mon global)
2375 - add_executable(ceph_test_mon_memory_target
2376 - test_mon_memory_target.cc
2377 - )
2378 --target_link_libraries(ceph_test_mon_memory_target ${UNITTEST_LIBS} Boost::system)
2379 -+target_link_libraries(ceph_test_mon_memory_target ${UNITTEST_LIBS} boost_system)
2380 - install(TARGETS ceph_test_mon_memory_target
2381 - DESTINATION ${CMAKE_INSTALL_BINDIR})
2382 -
2383 -diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt
2384 -index cde6348d57..e6ce738834 100644
2385 ---- a/src/test/rgw/CMakeLists.txt
2386 -+++ b/src/test/rgw/CMakeLists.txt
2387 -@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler)
2388 - target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock)
2389 - if(WITH_BOOST_CONTEXT)
2390 - target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING)
2391 -- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context)
2392 -+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context)
2393 - endif()
2394 -
2395 - if(WITH_RADOSGW_AMQP_ENDPOINT)
2396 -diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
2397 -index d31f3d2408..6945018b11 100644
2398 ---- a/src/tools/CMakeLists.txt
2399 -+++ b/src/tools/CMakeLists.txt
2400 -@@ -35,20 +35,20 @@ install(PROGRAMS
2401 - endif(WITH_TESTS)
2402 -
2403 - add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc)
2404 --target_link_libraries(ceph-osdomap-tool os global Boost::program_options)
2405 -+target_link_libraries(ceph-osdomap-tool os global boost_program_options)
2406 - install(TARGETS ceph-osdomap-tool DESTINATION bin)
2407 -
2408 - add_executable(ceph-monstore-tool
2409 - ceph_monstore_tool.cc
2410 - ../mgr/mgr_commands.cc)
2411 --target_link_libraries(ceph-monstore-tool os global Boost::program_options)
2412 -+target_link_libraries(ceph-monstore-tool os global boost_program_options)
2413 - install(TARGETS ceph-monstore-tool DESTINATION bin)
2414 -
2415 - add_executable(ceph-objectstore-tool
2416 - ceph_objectstore_tool.cc
2417 - rebuild_mondb.cc
2418 - RadosDump.cc)
2419 --target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS})
2420 -+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS})
2421 - if(WITH_FUSE)
2422 - target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES})
2423 - endif(WITH_FUSE)