From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- sys-cluster/ceph/Manifest | 10 +- sys-cluster/ceph/ceph-14.2.2.ebuild | 362 --------------------- sys-cluster/ceph/ceph-14.2.3.ebuild | 355 ++++++++++++++++++++ .../files/ceph-14.2.0-boost-1.70-sonames.patch | 321 ------------------ .../ceph/files/ceph-14.2.0-boost-1.70.patch | 120 ------- .../ceph/files/ceph-14.2.0-boost-sonames.patch | 334 ------------------- .../ceph-14.2.3-boost-1.6-python-sonames.patch | 26 ++ .../ceph/files/ceph-14.2.3-boost-1.70.patch | 78 +++++ .../ceph/files/ceph-14.2.3-boost-sonames.patch | 321 ++++++++++++++++++ 9 files changed, 785 insertions(+), 1142 deletions(-) delete mode 100644 sys-cluster/ceph/ceph-14.2.2.ebuild create mode 100644 sys-cluster/ceph/ceph-14.2.3.ebuild delete mode 100644 sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch delete mode 100644 sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch delete mode 100644 sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch create mode 100644 sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch create mode 100644 sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch create mode 100644 sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch (limited to 'sys-cluster/ceph') diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 90c40c9ee423..c3924bd95b5f 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -21,15 +21,15 @@ AUX ceph-13.2.2-dont-install-sysvinit-script.patch 471 BLAKE2B 85ef94f4940849636 AUX ceph-13.2.5-no-automagic-deps.patch 1056 BLAKE2B dbae76e4be1ca690ff59c0b905ef63b9fbcddcb25d181af2a514113f4bfd5028a8b5bce98c965d195ae69f8532731b2e9d9002f01bb91ccfcde5a29eb43b8f41 SHA512 60616eaaadbf4431769bc2e192718ee28842efc818ee561af1c2c7a5269e393efeb455260c36582d3265730d482a92fb911b4c501e486a3a6387ab4a10d1589d AUX ceph-13.2.6-dpdk-alignment.patch 612 BLAKE2B 7f75b53383979d5790862c91ff67b41c16d94e6572c9c387ae511401d22562493bddb296f47bef60ebf586683df36b5b62744ac30d43b1c4eede053d6ae4438a SHA512 058bf0a564a158356e5a87099ea8d1372123eeee8bfdb3c25870911dccc351f33e00793456c5c04f670946559cd49bc6a8cab5553dc99bebb570910b4a787d58 AUX ceph-13.2.6-no-virtualenvs.patch 4137 BLAKE2B 9cef3ed31ec0ab2d13091b0b76071532ffd021a5627fa91808bb7eff382a4b29945eaa6bc529e8ee3176056caf9f62af0fb4b4210d2549bbc05f018fd4ecd75c SHA512 051c80c70a951135e2a00f6688ff03f604f89c65be47c4e00e2f72ee1a071be067cc8a7a60fd4ef78587a6b79b2b26d52d5dc3efbdcf0e11d4e3e1156483b03e -AUX ceph-14.2.0-boost-1.70-sonames.patch 13703 BLAKE2B a619a07217895ae34a84c145930d9b477cc557d5088d1fb915f0427556330a24cb4385e953facf7cb2dcf99c1245bd25d2ebe25db56dec40648ad065bce7e873 SHA512 69f82d5f10b1237c17428b11e746422fcd0e1be735500032892d834361e636a23135cb7e6f537cbd808b74378325c24132a88f256abcce40ec1bdfe212b7648c -AUX ceph-14.2.0-boost-1.70.patch 5556 BLAKE2B 7610a48c30fe5cf8462f498501a36c17c33289967e7d50456d6b8e6c467db89b768f73bb6e69ecd4c6dec0432d4fbb47af339f02eb510ba69770b9b122b41dbf SHA512 71ee1d583f71b2c52fee40e5105d1ff1d4b676230eac7c19f42754316c3958808304155a48992f8766eded52d3e28007b631680dca8b4672153fa44b8eccbbb8 -AUX ceph-14.2.0-boost-sonames.patch 14155 BLAKE2B 766a3e40c8a4d94d1cc52a511f0d440178c199cb37b1d06a792fe627df4f01793d8555005054604397d02d9e366521b10788f6e56381a6d967814370e4298844 SHA512 91184e32d3ef28a43bc8e0d53b4f359c5b2177250b39bbcc7921e38d044ba54610713826bc64450a0b2232450f68e724d23757cc5c6d39e50855060e86890ed2 AUX ceph-14.2.0-cflags.patch 545 BLAKE2B 0f5c4e509b2252de7a4b914b99fb4abe13010a1c21b2b701530f6a29dcd41924e3b81841cb65b7b949af42b168ce9fe756b0551c31babf9c9498d394b2ea6aa8 SHA512 9e6bb46d5bbdc5d93f4f026b2a8d6bdb692d9ea6e7018c1bb0188d95ea8574c76238d968b340fd67ddaa3d8183b310e393e3549dc3a63a795fde696413b0ca94 AUX ceph-14.2.0-cython-0.29.patch 946 BLAKE2B c251b6a171e5e0bab3f8716b79eb3138a177c1f39e7cf433ba52d03d73de4b45abc2db6742237c8044519337297025cf577d210ace81457ff05325073aa5bb43 SHA512 82c1608928ee669ef60b8930ce82c443152c446e669e7bde9ce32f78571afb19a9620c3818b69ac8cb3ea33e7d7ac40f77c89162c71b19b157336d907fa23e3d AUX ceph-14.2.0-dpdk-cflags.patch 1171 BLAKE2B a6815317d3828cee8d2476d6cc77b60d089db5b5ab0b30fd24c0ac10270ce930ce3049f1b22af71e5b39a6e323c672245fb78753e7ed901055afac8371cbcb9f SHA512 ece01fcaf0b82c441618eea1f37fc2658aa356de1128121d368769fdbf6316b226ea15a781353b115c0a81921c8872bb3d003ecbb1e8f1b456bb8cf6db8f091e AUX ceph-14.2.0-link-crc32-statically.patch 428 BLAKE2B d324855dab736eeecf5835e79c4f2fad9ea4d10aa29b2b03ab6274efa2f54a5cfdad710552662a49d5f61466e1cd9d6c2fc8a42373961e3334f39b806e647feb SHA512 3efe70f826ebc207f1ce8744483c9a82ebbf8f3cfa81c9cbb3152b40f5b540cc9cc21e6bd3370197bee9a27a01c3e3725754d044069bb760c3dbfbc97fe4276d AUX ceph-14.2.0-mgr-python-version.patch 685 BLAKE2B fbd36e0f5fe45be7cc58cf11b2b83613c2f7f7fdfd64d4f04729c36e5ebc110341aa4c5521d9be590bfb7a7812525130e773a346827461df0a108fbde359b161 SHA512 af0851913cf8b42bad71ece4e41017f71e91db19aeeebb5ea0306055d6d6d9e7eb9ba34224bb2583ca437d44827de8852727e8a9dd809d942d4c277ec3da3214 AUX ceph-14.2.0-no-virtualenvs.patch 2349 BLAKE2B a012ab044f92c2a22c8f04661d2210585dbacb531ece528cc3d8d026ba692f46d1306b920826d02b93317de24c325542ac222a4e2b42684aa44f5c12019e2a29 SHA512 623eacb30565725768b80e56e876cef6f52c07b63d8a0f0cc9b16d82677014636f1fdffbf7ca77b21d6465fc84b7fa429153b5c51e6202c85b1fdd6c5ae96a38 +AUX ceph-14.2.3-boost-1.6-python-sonames.patch 987 BLAKE2B c70ee9689cbe2f7b3ad437285d9ab58a029ef35ea1a9f4a34891a32f3ac21068d28e0bbedcdefeee7f1748566e2133ce8c2c79eaf2a74b416a53c9cee4f3a7b9 SHA512 f8596e0c22270e771ae24498ea959e4d0079433198950fba05e172bdb6caa6ece75515f2fefc8aebc93cfd1b0a8ac087bf917bd99f6dd486fe855ba81a448c53 +AUX ceph-14.2.3-boost-1.70.patch 3591 BLAKE2B 12a947de968155cc9b73299757acb04f1588e988658f40b5bb6ef781d273a280543fd78a37cd5565599fe1bc7c187f7beaaa63a103d4b9ba1e7f3981e1027c87 SHA512 1bff4165c44a26950de22b01221e791b6cffe32653eceab0e9f03d3ae893b0b1fdab5659d5742335aa1fb519e34d2d841984ed8c844e8b8f1db8bc78bbed2472 +AUX ceph-14.2.3-boost-sonames.patch 13701 BLAKE2B 7d8fa01f56922770190d7cada4cd5404e1584cf8afc2a84aae9d0031e66d778af6e9b2072e405982ca652229b86169f5cdefcd7fe321a1626f9bec5ca014c54e SHA512 c6e7497a427c0ca10b4aa006020467e9ae6c2fb167f500d72d92adc953490a1f7062bbc2dcdeee61a6ab251fa3a27ddd6c64b190bb88e7993df1fd4084d39882 AUX ceph-mds_at.service 282 BLAKE2B 3a51e5d5e0490c021282a37961824d650891c2d84c077c6479a9ee733f8a16fbe65cf204aa74e30ddd24dc01f32740037a6bd137a40464d57e1afeba5a49f893 SHA512 3a37e187f925e1a5fb672ac90937f544f3b98ed5a30b6a6b931a600f9d6a245373085ed61b40e0c64b30dbfac51dd99cbeaeb7538b5f23953bc0dde1df94742d AUX ceph-mds_at.service.conf 115 BLAKE2B aaaa28074bf47ee98272337b536e6ca89dbbbb0443d7774c38f62da4b210a5b2ffbb53fa2b7f20dffbee08206a0868e33d381a89b613a25b88f897dd32753fd5 SHA512 e0b51882ec864271a6468141fdd185e24cafcd677f312a7658880a30c00fd58d9043b2651548ab23bd01e54be248a1e8c03545a8fda0b699ca051de7ceb925d8 AUX ceph-osd_at.service 362 BLAKE2B 7ccbf3428d687d1dfc3a8e10d56083802bba621d7cc9b965b55677e7ae8ce19bd178d31be687e47ed4ae21eef017c8913339cb465822ceadecd2e90cf84d692d SHA512 99c932fa99679a26b288ad57ca725a50847199915368a07ae1bb589ca777cd6e6a68e84f4d506a1097a06ace06eede176ea573e694bcbe43b434381116d63300 @@ -50,11 +50,11 @@ DIST ceph-12.2.12.tar.gz 77467762 BLAKE2B a5224432121db9ef49c1e22771d847399df2f7 DIST ceph-12.2.8.tar.gz 77243685 BLAKE2B 37c34396a0c276b8d79735e14934ac70da024822c2a060061531c234e03e5d41aad6c41dc64b05c2ce47f03287d0cae9ef9bed67e4a0861b6380c8ce1de4ea69 SHA512 91c5c11aaeef701b3e31c9f8a1192b6b79fd34f3b96c61595c65173c98bfce0009c5b7c9b29764f5e4d4b1f5ac2ca7109fed5ae598c176aba717a34a132fabac DIST ceph-13.2.5.tar.gz 91006057 BLAKE2B 68551e2f54d78aff7b0e9ec3c62e6a3394dd7c23e80924a5b400cd9666a05a42e5f22445deee4040f1b78201c6a6660b283109878d4c92d845821bff831c8a5e SHA512 6daea524523f829e725609328ea71f416b2c3a9530fa8956720a7bc69dc08e55a169654f500704579dc9ba693f04eedd7e04614c0850e9ab1169cd45f19039f8 DIST ceph-13.2.6.tar.gz 90808224 BLAKE2B cd7b4f4838eafc9dd580102cbb5247b86a153f90127f81355b556f32dbbacd2d7fb0144d15f99869a318a7148d2f50a9f995eb05aee056d7a5843830ede5702c SHA512 1e9c08d16b14447bf6b8bb72144e053aa9d5cf390bb4a6e878869e38895d3698073502fe9c4f8b775a3da872b920444bd01260105d3a839e53cf90cd27c6ab9c -DIST ceph-14.2.2.tar.gz 117536881 BLAKE2B 2926c3d6fde5e9540d4e797dabf61451ce78e5d2f8d382d192fd8c1759620075860ab0cea7512330f2965d11e4b37a0ecce4fa11d9c5d256ecc884fa5f604922 SHA512 1ce61fb75e331cca39aaa8c0498bbb3cb874edb22ea45a4c2d82171b5e0c7c4ab2b081674b77177d5e612a0efdfa01de10a4becc4a7ee0eed1b2b3d358a72dc1 +DIST ceph-14.2.3.tar.gz 118349530 BLAKE2B db73d6adeca84426eee1b47a8ee68c4f94ee7a61e60ef1127153d19e02472a658877ebb7adfad5b4725d2c8c38855636bad1c44e79a3d3c397b56f74bf4b53fa SHA512 3d02e766a1d53d39355ee88738dd0233dc02f8a3cb44935194cb538b888507de8f8acdd99bf7890895f68795a310f53e2a8652305d5f2be5212efbd9046bd3a9 EBUILD ceph-12.2.11.ebuild 8025 BLAKE2B 0b7a0acd31afef011b05907332ecafd8ca72fe6d90244bcdfd879eb1b554a6293349b16638ad151052048019863ede89da0aa5024a6561c9016fab15f24f1778 SHA512 b6d0203fb1aec6ba62a2d7db6ee62794efab5389f4ac9a86cb4ad796f6f81985f8d8e107d55abfdc669a6beb55ecaeaa2e71d4283f3d93ee135803bc2d17293f EBUILD ceph-12.2.12-r2.ebuild 8390 BLAKE2B dbbf53017559230bfc03f4cf267e325e5c2c112657ced392c9ce93653fe796d2793b198150f24e8217c5b8c8a1fde750cb1ffa16cde2d5c990cd77e69001bfd8 SHA512 48e7f521c584aba6373f5e63c5769671cd016f0726fb30233b57c8a1598b01570fcee9765c3a58a6bdbdd92fe5c3bd8bf4e16aca340a47986c546624fb5c20d5 EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B e99590739ce73d96895c282108d3b945bb0e13bdb73e34b06d2da5c9e7d74dc4fdceddfb6330a106b775c612c7cca6b67325b83389f1c6d5af712e59a6f1fd55 SHA512 ab8d2a1ee7c4a7d7179f81e18dc601a18da365663351d88cf6dfee32e2aaaf40412bc2fde98d7c07012f79f8b6c19bac773ef97b872a32b663748ce41a5954c1 EBUILD ceph-13.2.5-r4.ebuild 9007 BLAKE2B fc84d7fee8572582743979cd3da76cdd337667843410f8efb167ec80442d006b6d4c1c947ffeeb9c6265c47116a6cf15a012f4277c619cb55ad942b0e95f6cdb SHA512 eec2780a80d98b3a535a33c86efaae4112605b8c6e220b61beb9956ece895a8807024fe71f86b626c89b3ca8af3b94a4c0e990c47e9951cc31490a90c1841ff3 EBUILD ceph-13.2.6.ebuild 9133 BLAKE2B d5990d637edaa460b90eadc0b97c8952b2e7688c4916f0978bb15e9c2b99c206f3be5c2f57ded889393e5ba32fa63bf08a89138ea96a7045b6a47a3cd59d0381 SHA512 7a510c208b8b15fe124aafba24d25c0f181bc2ff61710d274e59c383f5d0a27ef83fbbd6b19e1020953887a0a4221769d88e8f75e720d0af3fa93ba5d9c50792 -EBUILD ceph-14.2.2.ebuild 10064 BLAKE2B 541bfe6eab26c3d8fa2a9dd64ac6287252eace7d2648d3395431956cf79687740eb3c11f6af5f0cbfc484a789b16d0e2b019289f88981ec013f9160a71687648 SHA512 4879ef1d46d9e152f8199fa7811d6341f7e7dcdc1a9904b5cda4129319ca89104141a93b82b227fb548753fbe889791e46c065349c0c71b1c9fc76a53a866c2f +EBUILD ceph-14.2.3.ebuild 9770 BLAKE2B 8827e1e4d8c734942599b393ec9625c378c81a4532e640860419067feb7b687f04ec8a7d5852e30bfac90c4baa26a37245aaf19a576f956cd70201195751edd3 SHA512 84e76634c608fad0488ca3992c91915eb8108f93b7f7211e1eb8cd6dbfbc99c486dec4ef88015a2b6cb51ac19760aa8695e12adc2e3603c3a9555b8dc60b1494 MISC metadata.xml 1588 BLAKE2B c3a1f7afa0e61fc589e60ec00bc1702a6f953bbbbc1ab6a8582fe08bad9f6af9217350641399bc7de4dfb69a79ee0e41b46d971eef53348f3b568c6dcd439273 SHA512 ac2196349f897b7dfafaa924cda3f4eb094233bd04e7949b9f8fafd135775202c3c1bdc11cc4a931e752fb40b9d1c86524cdd849a23d364e4f2aa240bbdf1250 diff --git a/sys-cluster/ceph/ceph-14.2.2.ebuild b/sys-cluster/ceph/ceph-14.2.2.ebuild deleted file mode 100644 index 0f25b21d3b71..000000000000 --- a/sys-cluster/ceph/ceph-14.2.2.ebuild +++ /dev/null @@ -1,362 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) -DISTUTILS_OPTIONAL=1 - -inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ - multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ - systemd - -if [[ ${PV} == *9999* ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/ceph/ceph.git" - SRC_URI="" -else - SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -DESCRIPTION="Ceph distributed filesystem" -HOMEPAGE="https://ceph.com/" - -LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain" -SLOT="0" - -CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) - -IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" -IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost" -IUSE+=" systemd +tcmalloc test xfs zfs" -IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" - -COMMON_DEPEND=" - virtual/libudev:= - app-arch/bzip2:=[static-libs?] - app-arch/lz4:=[static-libs?] - app-arch/snappy:=[static-libs?] - app-arch/zstd:=[static-libs?] - app-misc/jq:=[static-libs?] - dev-libs/crypto++:=[static-libs?] - dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] - dev-libs/libaio:=[static-libs?] - dev-libs/libxml2:=[static-libs?] - dev-libs/nss:= - sys-auth/oath-toolkit:= - sys-apps/keyutils:=[static-libs?] - sys-apps/util-linux:=[static-libs?] - sys-libs/ncurses:0=[static-libs?] - sys-libs/zlib:=[static-libs?] - babeltrace? ( dev-util/babeltrace ) - ldap? ( net-nds/openldap:=[static-libs?] ) - lttng? ( dev-util/lttng-ust:= ) - fuse? ( sys-fs/fuse:0=[static-libs?] ) - kerberos? ( virtual/krb5 ) - rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) - ssl? ( - !libressl? ( dev-libs/openssl:=[static-libs?] ) - libressl? ( dev-libs/libressl:=[static-libs?] ) - ) - xfs? ( sys-fs/xfsprogs:=[static-libs?] ) - zfs? ( sys-fs/zfs:=[static-libs?] ) - radosgw? ( - dev-libs/expat:=[static-libs?] - !libressl? ( - dev-libs/openssl:=[static-libs?] - net-misc/curl:=[curl_ssl_openssl,static-libs?] - ) - libressl? ( - dev-libs/libressl:=[static-libs?] - net-misc/curl:=[curl_ssl_libressl,static-libs?] - ) - ) - system-boost? ( - || ( - ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] - ) - jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) - !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) - ${PYTHON_DEPS} - " -DEPEND="${COMMON_DEPEND} - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) - dev-python/cython[${PYTHON_USEDEP}] - dev-python/sphinx - dev-util/cunit - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/virtualenv[${PYTHON_USEDEP}] - sys-apps/grep[pcre] - sys-fs/btrfs-progs - ) - " -BDEPEND=" app-arch/cpio - >=dev-util/cmake-3.5.0 - dev-util/gperf - dev-util/valgrind - sys-apps/which - sys-devel/bc - virtual/pkgconfig - " -RDEPEND="${COMMON_DEPEND} - net-misc/socat - sys-apps/gptfdisk - sys-block/parted - sys-fs/cryptsetup - sys-fs/lvm2[-device-mapper-only(-)] - !/dev/null || die - emake VERBOSE=1 clean - emake VERBOSE=1 all - - # python modules are only compiled with "make install" so we need to do this to - # prevent doing a bunch of compilation in src_install - DESTDIR="${T}" emake VERBOSE=1 install - popd >/dev/null || die -} - -src_compile() { - cmake-utils_src_make VERBOSE=1 all - - # we have to do this here to prevent from building everything multiple times - python_copy_sources - python_foreach_impl python_compile -} - -src_test() { - make check || die "make check failed" -} - -python_install() { - local CMAKE_USE_DIR="${S}" - pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - DESTDIR="${ED}" emake VERBOSE=1 install - popd >/dev/null || die -} - -src_install() { - cmake-utils_src_install - python_foreach_impl python_install - - find "${ED}" -name '*.la' -type f -delete || die - - exeinto /usr/$(get_libdir)/ceph - newexe "${BUILD_DIR}/bin/init-ceph" init-ceph - - insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} - - keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat - - fowners -R ceph:ceph /var/lib/ceph /var/log/ceph - - newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} - newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} - - insinto /etc/sysctl.d - newins "${FILESDIR}"/sysctld 90-${PN}.conf - - use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc - - # units aren't installed by the build system unless systemd is enabled - # so no point installing these with the USE flag disabled - if use systemd; then - systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ - "ceph-mds@.service" - - systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ - "ceph-osd@.service" - fi - - udev_dorules udev/*.rules - - readme.gentoo_create_doc - - python_setup 'python3*' - - # bug #630232 - sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ - || die "sed failed" - - python_fix_shebang "${ED}"/usr/{,s}bin/ - - # python_fix_shebang apparently is not idempotent - sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ - "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed" - - local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) - dostrip -x "${rados_classes[@]#${ED}}" -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-cluster/ceph/ceph-14.2.3.ebuild b/sys-cluster/ceph/ceph-14.2.3.ebuild new file mode 100644 index 000000000000..f440a49160c9 --- /dev/null +++ b/sys-cluster/ceph/ceph-14.2.3.ebuild @@ -0,0 +1,355 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +DISTUTILS_OPTIONAL=1 + +inherit check-reqs bash-completion-r1 cmake-utils distutils-r1 flag-o-matic \ + multiprocessing python-r1 udev user readme.gentoo-r1 toolchain-funcs \ + systemd + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ceph/ceph.git" + SRC_URI="" +else + SRC_URI="https://download.ceph.com/tarballs/${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" +fi + +DESCRIPTION="Ceph distributed filesystem" +HOMEPAGE="https://ceph.com/" + +LICENSE="LGPL-2.1 CC-BY-SA-3.0 GPL-2 GPL-2+ LGPL-2+ BSD Boost-1.0 MIT public-domain" +SLOT="0" + +CPU_FLAGS_X86=(sse{,2,3,4_1,4_2} ssse3) + +IUSE="babeltrace cephfs dpdk fuse grafana jemalloc kerberos ldap libressl" +IUSE+=" lttng +mgr numa rabbitmq +radosgw +ssl static-libs system-boost" +IUSE+=" systemd +tcmalloc test xfs zfs" +IUSE+=" $(printf "cpu_flags_x86_%s\n" ${CPU_FLAGS_X86[@]})" + +COMMON_DEPEND=" + virtual/libudev:= + app-arch/bzip2:=[static-libs?] + app-arch/lz4:=[static-libs?] + app-arch/snappy:=[static-libs?] + app-arch/zstd:=[static-libs?] + app-misc/jq:=[static-libs?] + dev-libs/crypto++:=[static-libs?] + dev-libs/leveldb:=[snappy,static-libs?,tcmalloc?] + dev-libs/libaio:=[static-libs?] + dev-libs/libxml2:=[static-libs?] + dev-libs/nss:= + sys-auth/oath-toolkit:= + sys-apps/keyutils:=[static-libs?] + sys-apps/util-linux:=[static-libs?] + sys-libs/ncurses:0=[static-libs?] + sys-libs/zlib:=[static-libs?] + babeltrace? ( dev-util/babeltrace ) + ldap? ( net-nds/openldap:=[static-libs?] ) + lttng? ( dev-util/lttng-ust:= ) + fuse? ( sys-fs/fuse:0=[static-libs?] ) + kerberos? ( virtual/krb5 ) + rabbitmq? ( net-libs/rabbitmq-c:=[static-libs?] ) + ssl? ( + !libressl? ( dev-libs/openssl:=[static-libs?] ) + libressl? ( dev-libs/libressl:=[static-libs?] ) + ) + xfs? ( sys-fs/xfsprogs:=[static-libs?] ) + zfs? ( sys-fs/zfs:=[static-libs?] ) + radosgw? ( + dev-libs/expat:=[static-libs?] + !libressl? ( + dev-libs/openssl:=[static-libs?] + net-misc/curl:=[curl_ssl_openssl,static-libs?] + ) + libressl? ( + dev-libs/libressl:=[static-libs?] + net-misc/curl:=[curl_ssl_libressl,static-libs?] + ) + ) + system-boost? ( + || ( + ~dev-libs/boost-1.70.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ~dev-libs/boost-1.67.0[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ) + dev-libs/boost:=[threads,context,python,static-libs?,${PYTHON_USEDEP}] + ) + jemalloc? ( dev-libs/jemalloc:=[static-libs?] ) + !jemalloc? ( >=dev-util/google-perftools-2.4:=[static-libs?] ) + ${PYTHON_DEPS} + " +DEPEND="${COMMON_DEPEND} + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) + dev-python/cython[${PYTHON_USEDEP}] + dev-python/sphinx + dev-util/cunit + test? ( + dev-python/coverage[${PYTHON_USEDEP}] + dev-python/virtualenv[${PYTHON_USEDEP}] + sys-apps/grep[pcre] + sys-fs/btrfs-progs + ) + " +BDEPEND=" app-arch/cpio + >=dev-util/cmake-3.5.0 + dev-util/gperf + dev-util/valgrind + sys-apps/which + sys-devel/bc + virtual/pkgconfig + " +RDEPEND="${COMMON_DEPEND} + net-misc/socat + sys-apps/gptfdisk + sys-block/parted + sys-fs/cryptsetup + sys-fs/lvm2[-device-mapper-only(-)] + !=dev-libs/boost-1.70.0' || \ + eapply "${FILESDIR}/ceph-14.2.3-boost-1.6-python-sonames.patch" + fi + + sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \ + src/bash_completion/CMakeLists.txt || die + + # remove tests that need root access + rm src/test/cli/ceph-authtool/cap*.t || die +} + +ceph_src_configure() { + local flag + local mycmakeargs=( + -DWITH_BABELTRACE=$(usex babeltrace) + -DWITH_CEPHFS=$(usex cephfs) + -DWITH_CEPHFS_SHELL=$(if python_is_python3; then usex cephfs; else echo OFF; fi) + -DWITH_DPDK=$(usex dpdk) + -DWITH_FUSE=$(usex fuse) + -DWITH_LTTNG=$(usex lttng) + -DWITH_GSSAPI=$(usex kerberos) + -DWITH_GRAFANA=$(usex grafana) + -DWITH_MGR=$(usex mgr) + -DWITH_MGR_DASHBOARD_FRONTEND=NO + -DWITH_NUMA=$(usex numa) + -DWITH_OPENLDAP=$(usex ldap) + -DMGR_PYTHON_VERSION=$(if python_is_python3; then echo 3; else echo 2; fi) + -DWITH_PYTHON3=$(if python_is_python3; then echo "ON"; else echo "OFF"; fi) + -DWITH_PYTHON2=$(if python_is_python3; then echo "OFF"; else echo "ON"; fi) + -DWITH_RADOSGW=$(usex radosgw) + -DWITH_RADOSGW_AMQP_ENDPOINT=$(usex rabbitmq) + -DWITH_SSL=$(usex ssl) + -DWITH_SYSTEMD=$(usex systemd) + -DWITH_TESTS=$(usex test) + -DWITH_XFS=$(usex xfs) + -DWITH_ZFS=$(usex zfs) + -DENABLE_SHARED=$(usex static-libs '' 'ON' 'OFF') + -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") + -DWITH_SYSTEM_BOOST=$(usex system-boost) + -DBOOST_J=$(makeopts_jobs) + -DWITH_RDMA=no + -DWITH_TBB=no + -DSYSTEMD_UNITDIR=$(systemd_get_systemunitdir) + -DEPYTHON_VERSION="${EPYTHON#python}" + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" + -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" + #-Wno-dev + ) + if use amd64 || use x86; then + for flag in ${CPU_FLAGS_X86[@]}; do + mycmakeargs+=("$(usex cpu_flags_x86_${flag} "-DHAVE_INTEL_${flag^^}=1")") + done + fi + + rm -f "${BUILD_DIR:-${S}}/CMakeCache.txt" \ + || die "failed to remove cmake cache" + + cmake-utils_src_configure + + # bug #630232 + sed -i "s:\"${T//:\\:}/${EPYTHON}/bin/python\":\"${PYTHON}\":" \ + "${BUILD_DIR:-${S}}"/include/acconfig.h \ + || die "sed failed" +} + +src_configure() { + ceph_src_configure +} + +python_compile() { + local CMAKE_USE_DIR="${S}" + ceph_src_configure + + pushd "${BUILD_DIR}/src/pybind" >/dev/null || die + emake VERBOSE=1 clean + emake VERBOSE=1 all + + # python modules are only compiled with "make install" so we need to do this to + # prevent doing a bunch of compilation in src_install + DESTDIR="${T}" emake VERBOSE=1 install + popd >/dev/null || die +} + +src_compile() { + cmake-utils_src_make VERBOSE=1 all + + # we have to do this here to prevent from building everything multiple times + python_copy_sources + python_foreach_impl python_compile +} + +src_test() { + make check || die "make check failed" +} + +python_install() { + local CMAKE_USE_DIR="${S}" + pushd "${BUILD_DIR}/src/pybind" >/dev/null || die + DESTDIR="${ED}" emake VERBOSE=1 install + popd >/dev/null || die +} + +src_install() { + cmake-utils_src_install + python_foreach_impl python_install + + find "${ED}" -name '*.la' -type f -delete || die + + exeinto /usr/$(get_libdir)/ceph + newexe "${BUILD_DIR}/bin/init-ceph" init-ceph + + insinto /etc/logrotate.d/ + newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} + + keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat + + fowners -R ceph:ceph /var/lib/ceph /var/log/ceph + + newinitd "${FILESDIR}/rbdmap.initd" rbdmap + newinitd "${FILESDIR}/${PN}.initd-r12" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r5" ${PN} + + insinto /etc/sysctl.d + newins "${FILESDIR}"/sysctld 90-${PN}.conf + + use tcmalloc && newenvd "${FILESDIR}"/envd-tcmalloc 99${PN}-tcmalloc + + # units aren't installed by the build system unless systemd is enabled + # so no point installing these with the USE flag disabled + if use systemd; then + systemd_install_serviced "${FILESDIR}/ceph-mds_at.service.conf" \ + "ceph-mds@.service" + + systemd_install_serviced "${FILESDIR}/ceph-osd_at.service.conf" \ + "ceph-osd@.service" + fi + + udev_dorules udev/*.rules + + readme.gentoo_create_doc + + python_setup 'python3*' + + # bug #630232 + sed -i -r "s:${T//:/\\:}/${EPYTHON}:/usr:" "${ED}"/usr/bin/ceph{,-crash} \ + || die "sed failed" + + python_fix_shebang "${ED}"/usr/{,s}bin/ + + # python_fix_shebang apparently is not idempotent + sed -i -r 's:(/usr/lib/python-exec/python[0-9]\.[0-9]/python)[0-9]\.[0-9]:\1:' \ + "${ED}"/usr/sbin/{mount.*,ceph-volume{,-systemd}} || die "sed failed" + + local -a rados_classes=( "${ED}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${ED}}" +} + +pkg_postinst() { + readme.gentoo_print_elog +} diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch deleted file mode 100644 index 6d7120037424..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70-sonames.patch +++ /dev/null @@ -1,321 +0,0 @@ -diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake -index bfab4ca436..90ed0cbb17 100644 ---- a/cmake/modules/FindBoost.cmake -+++ b/cmake/modules/FindBoost.cmake -@@ -1181,10 +1181,10 @@ endif() - # on all platforms to keep end user code free from platform dependent - # code. Also provide convenience targets to disable autolinking and - # enable dynamic linking. --if(NOT TARGET Boost::diagnostic_definitions) -- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) -- add_library(Boost::disable_autolinking INTERFACE IMPORTED) -- add_library(Boost::dynamic_linking INTERFACE IMPORTED) -+if(NOT TARGET boost_diagnostic_definitions) -+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED) -+ add_library(boost_disable_autolinking INTERFACE IMPORTED) -+ add_library(boost_dynamic_linking INTERFACE IMPORTED) - endif() - if(WIN32) - # In windows, automatic linking is performed, so you do not have -@@ -1205,11 +1205,11 @@ if(WIN32) - # code to emit a #pragma message each time a library is selected - # for linking. - set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC") -- set_target_properties(Boost::diagnostic_definitions PROPERTIES -+ set_target_properties(boost_diagnostic_definitions PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC") -- set_target_properties(Boost::disable_autolinking PROPERTIES -+ set_target_properties(boost_disable_autolinking PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") -- set_target_properties(Boost::dynamic_linking PROPERTIES -+ set_target_properties(boost_dynamic_linking PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") - endif() - -@@ -2018,52 +2018,52 @@ if(Boost_FOUND) - endif() - - foreach(COMPONENT ${Boost_FIND_COMPONENTS}) -- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT}) -+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT}) - string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - if(Boost_${UPPERCOMPONENT}_FOUND) - if(Boost_USE_STATIC_LIBS) -- add_library(Boost::${COMPONENT} STATIC IMPORTED) -+ add_library(boost_${COMPONENT} STATIC IMPORTED) - else() - # Even if Boost_USE_STATIC_LIBS is OFF, we might have static - # libraries as a result. -- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED) -+ add_library(boost_${COMPONENT} UNKNOWN IMPORTED) - endif() - if(Boost_INCLUDE_DIRS) -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") - endif() - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}") -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" - IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}") - endif() - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") -- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY -+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY - IMPORTED_CONFIGURATIONS RELEASE) -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") - endif() - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") -- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY -+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY - IMPORTED_CONFIGURATIONS DEBUG) -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" - IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") - endif() - if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES) - unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES) - foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES}) -- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep}) -+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep}) - endforeach() - if(COMPONENT STREQUAL "thread") - list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads) - endif() -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}") - endif() - if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES) -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}") - endif() - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1b1f19d464..21c222280f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -353,12 +353,12 @@ set(ceph_common_objs - set(ceph_common_deps - json_spirit erasure_code arch crc32 - ${LIB_RESOLV} -- Boost::thread -- Boost::system -- Boost::random -- Boost::program_options -- Boost::date_time -- Boost::iostreams -+ boost_thread -+ boost_system -+ boost_random -+ boost_program_options -+ boost_date_time -+ boost_iostreams - ${BLKID_LIBRARIES} - ${Backtrace_LIBRARIES} - ${BLKIN_LIBRARIES} -@@ -518,7 +518,7 @@ if (WITH_CEPHFS) - ceph_mds.cc) - add_executable(ceph-mds ${ceph_mds_srcs}) - target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common -- Boost::thread) -+ boost_thread) - install(TARGETS ceph-mds DESTINATION bin) - endif() - -diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt -index d7b58521d4..e1533af33f 100644 ---- a/src/crimson/CMakeLists.txt -+++ b/src/crimson/CMakeLists.txt -@@ -106,8 +106,8 @@ target_link_libraries(crimson-common - PRIVATE - crc32 - crimson::cflags -- Boost::iostreams -- Boost::random -+ boost_iostreams -+ boost_random - ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto) - - set(crimson_auth_srcs -diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt -index 252fb3e5e3..213482da16 100644 ---- a/src/mgr/CMakeLists.txt -+++ b/src/mgr/CMakeLists.txt -@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") - target_link_libraries(ceph-mgr - osdc client heap_profiler - global-static ceph-common -- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} -+ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} - ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) - set_target_properties(ceph-mgr PROPERTIES - POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) -diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt -index e9d3804c5f..5c6eb58de1 100644 ---- a/src/rbd_replay/CMakeLists.txt -+++ b/src/rbd_replay/CMakeLists.txt -@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) - global - babeltrace - babeltrace-ctf -- Boost::date_time -+ boost_date_time - ) - install(TARGETS rbd-replay-prep DESTINATION bin) - endif(HAVE_BABELTRACE) -diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt -index ccc4f74cfe..854aa6e5e9 100644 ---- a/src/rgw/CMakeLists.txt -+++ b/src/rgw/CMakeLists.txt -@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL) - endif() - - if(WITH_BOOST_CONTEXT) -- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context) -+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context) - endif() - - set(rgw_libs rgw_a) -@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT) - target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ) - endif() - if(WITH_BOOST_CONTEXT) -- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context) -+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context) - endif() - - if(WITH_TESTS) -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 20a64fd41b..a8bb323614 100644 ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -158,7 +158,7 @@ add_executable(ceph_omapbench - ) - target_link_libraries(ceph_omapbench - librados -- Boost::program_options -+ boost_program_options - global - ${BLKID_LIBRARIES} - ${CMAKE_DL_LIBS} -diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt -index 71fb77cda9..aff8fb6565 100644 ---- a/src/test/common/CMakeLists.txt -+++ b/src/test/common/CMakeLists.txt -@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject) - - add_executable(unittest_async_completion test_async_completion.cc) - add_ceph_unittest(unittest_async_completion) --target_link_libraries(unittest_async_completion Boost::system) -+target_link_libraries(unittest_async_completion boost_system) - - add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc) - add_ceph_unittest(unittest_async_shared_mutex) --target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system) -+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system) -diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt -index 721f6c3675..1cd9635c77 100644 ---- a/src/test/erasure-code/CMakeLists.txt -+++ b/src/test/erasure-code/CMakeLists.txt -@@ -2,15 +2,15 @@ - add_executable(ceph_erasure_code_benchmark - ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc - ceph_erasure_code_benchmark.cc) --target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - install(TARGETS ceph_erasure_code_benchmark - DESTINATION bin) - - add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) --target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - - add_executable(ceph_erasure_code ceph_erasure_code.cc) --target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - install(TARGETS ceph_erasure_code - DESTINATION bin) - -diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt -index 4fc53d2406..e6304394f8 100644 ---- a/src/test/librados/CMakeLists.txt -+++ b/src/test/librados/CMakeLists.txt -@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc) - target_link_libraries(ceph_test_rados_api_asio global - librados ${UNITTEST_LIBS}) - if(WITH_BOOST_CONTEXT) -- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) -+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) - endif() - - add_executable(ceph_test_rados_api_list -@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp - tier_cxx.cc - $) - target_link_libraries(ceph_test_rados_api_tier_pp -- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx) -+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx) - - add_executable(ceph_test_rados_api_snapshots - snapshots.cc) -diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt -index 2bf6723c40..e99b8afa11 100644 ---- a/src/test/librbd/CMakeLists.txt -+++ b/src/test/librbd/CMakeLists.txt -@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE - radostest - radostest-cxx - librados -- Boost::thread -+ boost_thread - GMock::GMock - GTest::GTest) - -diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt -index 9b2c6b6321..80e4cb7829 100644 ---- a/src/test/rgw/CMakeLists.txt -+++ b/src/test/rgw/CMakeLists.txt -@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler) - target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock) - if(WITH_BOOST_CONTEXT) - target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) -- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) -+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context) - endif() - - if(WITH_RADOSGW_AMQP_ENDPOINT) -diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt -index d31f3d2408..6945018b11 100644 ---- a/src/tools/CMakeLists.txt -+++ b/src/tools/CMakeLists.txt -@@ -35,20 +35,20 @@ install(PROGRAMS - endif(WITH_TESTS) - - add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) --target_link_libraries(ceph-osdomap-tool os global Boost::program_options) -+target_link_libraries(ceph-osdomap-tool os global boost_program_options) - install(TARGETS ceph-osdomap-tool DESTINATION bin) - - add_executable(ceph-monstore-tool - ceph_monstore_tool.cc - ../mgr/mgr_commands.cc) --target_link_libraries(ceph-monstore-tool os global Boost::program_options) -+target_link_libraries(ceph-monstore-tool os global boost_program_options) - install(TARGETS ceph-monstore-tool DESTINATION bin) - - add_executable(ceph-objectstore-tool - ceph_objectstore_tool.cc - rebuild_mondb.cc - RadosDump.cc) --target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) - if(WITH_FUSE) - target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES}) - endif(WITH_FUSE) diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch deleted file mode 100644 index ce2ee92b3d8e..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.0-boost-1.70.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f97f96b5bf..f5e5d06d35 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -657,13 +657,13 @@ if(WITH_SYSTEM_BOOST) - if(BOOST_ROOT AND CMAKE_LIBRARY_ARCHITECTURE) - set(BOOST_LIBRARYDIR "${BOOST_ROOT}/lib/${CMAKE_LIBRARY_ARCHITECTURE}") - endif() -- find_package(Boost 1.67 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) -+ find_package(Boost 1.70 COMPONENTS ${BOOST_COMPONENTS} REQUIRED) - else() - set(BOOST_J 1 CACHE STRING - "max jobs for Boost build") # override w/-DBOOST_J= - set(Boost_USE_STATIC_LIBS ON) - include(BuildBoost) -- build_boost(1.67 -+ build_boost(1.70 - COMPONENTS ${BOOST_COMPONENTS} ${BOOST_HEADER_COMPONENTS}) - endif() - include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS}) -diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake -index f46cc0d485..4254508570 100644 ---- a/cmake/modules/BuildBoost.cmake -+++ b/cmake/modules/BuildBoost.cmake -@@ -137,14 +137,14 @@ function(do_build_boost version) - check_boost_version("${PROJECT_SOURCE_DIR}/src/boost" ${version}) - set(source_dir - SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost") -- elseif(version VERSION_GREATER 1.67) -+ elseif(version VERSION_GREATER 1.70) - message(FATAL_ERROR "Unknown BOOST_REQUESTED_VERSION: ${version}") - else() - message(STATUS "boost will be downloaded...") - # NOTE: If you change this version number make sure the package is available - # at the three URLs below (may involve uploading to download.ceph.com) -- set(boost_version 1.67.0) -- set(boost_sha256 2684c972994ee57fc5632e03bf044746f6eb45d4920c343937a465fd67a5adba) -+ set(boost_version 1.70.0) -+ set(boost_sha256 430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778) - string(REPLACE "." "_" boost_version_underscore ${boost_version} ) - set(boost_url - https://dl.bintray.com/boostorg/release/${boost_version}/source/boost_${boost_version_underscore}.tar.bz2) -diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc -index e4be074ec7..4af3695dc1 100644 ---- a/src/rgw/rgw_asio_frontend.cc -+++ b/src/rgw/rgw_asio_frontend.cc -@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO { - using SharedMutex = ceph::async::SharedMutex; - - template --void handle_connection(RGWProcessEnv& env, Stream& stream, -+void handle_connection(boost::asio::io_context& context, -+ RGWProcessEnv& env, Stream& stream, - boost::beast::flat_buffer& buffer, bool is_ssl, - SharedMutex& pause_mutex, - rgw::dmclock::Scheduler *scheduler, -@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream, - rgw::io::add_conlen_controlling( - &real_client)))); - RGWRestfulIO client(cct, &real_client_io); -- auto y = optional_yield{socket.get_io_context(), yield}; -+ auto y = optional_yield{context, yield}; - process_request(env.store, env.rest, &req, env.uri_prefix, - *env.auth_registry, &client, env.olog, y, scheduler); - } -@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) - return; - } - buffer.consume(bytes); -- handle_connection(env, stream, buffer, true, pause_mutex, -+ handle_connection(context, env, stream, buffer, true, pause_mutex, - scheduler.get(), ec, yield); - if (!ec) { - // ssl shutdown (ignoring errors) -@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) - auto c = connections.add(conn); - boost::beast::flat_buffer buffer; - boost::system::error_code ec; -- handle_connection(env, s, buffer, false, pause_mutex, -+ handle_connection(context, env, s, buffer, false, pause_mutex, - scheduler.get(), ec, yield); - s.shutdown(tcp::socket::shutdown_both, ec); - }); -diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h -index 70487a5253..1d454acd2e 100644 ---- a/src/rgw/rgw_dmclock_async_scheduler.h -+++ b/src/rgw/rgw_dmclock_async_scheduler.h -@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler { - using Completion = async::Completion>; - - using Clock = ceph::coarse_real_clock; -+#if BOOST_VERSION < 107000 - using Timer = boost::asio::basic_waitable_timer; -+#else -+ using Timer = boost::asio::basic_waitable_timer, executor_type>; -+#endif - Timer timer; //< timer for the next scheduled request - - CephContext *const cct; -diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h -index d99a6ff68d..213fc238d2 100644 ---- a/src/rgw/rgw_reshard.h -+++ b/src/rgw/rgw_reshard.h -@@ -183,7 +183,14 @@ class RGWReshardWait { - ceph::condition_variable cond; - - struct Waiter : boost::intrusive::list_base_hook<> { -- boost::asio::basic_waitable_timer timer; -+#if BOOST_VERSION < 107000 -+ using Timer = boost::asio::basic_waitable_timer; -+#else -+ using Executor = boost::asio::io_context::executor_type; -+ using Timer = boost::asio::basic_waitable_timer, Executor>; -+#endif -+ Timer timer; - explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {} - }; - boost::intrusive::list waiters; diff --git a/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch deleted file mode 100644 index 497d59530511..000000000000 --- a/sys-cluster/ceph/files/ceph-14.2.0-boost-sonames.patch +++ /dev/null @@ -1,334 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dbabecbe97..d12b696bb5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container) - - if(WITH_MGR) - list(APPEND BOOST_COMPONENTS -- python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}) -+ python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR}) - endif() - if(WITH_BOOST_CONTEXT) - list(APPEND BOOST_COMPONENTS context coroutine) -diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake -index bfab4ca436..90ed0cbb17 100644 ---- a/cmake/modules/FindBoost.cmake -+++ b/cmake/modules/FindBoost.cmake -@@ -1181,10 +1181,10 @@ endif() - # on all platforms to keep end user code free from platform dependent - # code. Also provide convenience targets to disable autolinking and - # enable dynamic linking. --if(NOT TARGET Boost::diagnostic_definitions) -- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) -- add_library(Boost::disable_autolinking INTERFACE IMPORTED) -- add_library(Boost::dynamic_linking INTERFACE IMPORTED) -+if(NOT TARGET boost_diagnostic_definitions) -+ add_library(boost_diagnostic_definitions INTERFACE IMPORTED) -+ add_library(boost_disable_autolinking INTERFACE IMPORTED) -+ add_library(boost_dynamic_linking INTERFACE IMPORTED) - endif() - if(WIN32) - # In windows, automatic linking is performed, so you do not have -@@ -1205,11 +1205,11 @@ if(WIN32) - # code to emit a #pragma message each time a library is selected - # for linking. - set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC") -- set_target_properties(Boost::diagnostic_definitions PROPERTIES -+ set_target_properties(boost_diagnostic_definitions PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC") -- set_target_properties(Boost::disable_autolinking PROPERTIES -+ set_target_properties(boost_disable_autolinking PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") -- set_target_properties(Boost::dynamic_linking PROPERTIES -+ set_target_properties(boost_dynamic_linking PROPERTIES - INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") - endif() - -@@ -2018,52 +2018,52 @@ if(Boost_FOUND) - endif() - - foreach(COMPONENT ${Boost_FIND_COMPONENTS}) -- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT}) -+ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT}) - string(TOUPPER ${COMPONENT} UPPERCOMPONENT) - if(Boost_${UPPERCOMPONENT}_FOUND) - if(Boost_USE_STATIC_LIBS) -- add_library(Boost::${COMPONENT} STATIC IMPORTED) -+ add_library(boost_${COMPONENT} STATIC IMPORTED) - else() - # Even if Boost_USE_STATIC_LIBS is OFF, we might have static - # libraries as a result. -- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED) -+ add_library(boost_${COMPONENT} UNKNOWN IMPORTED) - endif() - if(Boost_INCLUDE_DIRS) -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") - endif() - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}") -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" - IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}") - endif() - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") -- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY -+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY - IMPORTED_CONFIGURATIONS RELEASE) -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" - IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") - endif() - if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") -- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY -+ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY - IMPORTED_CONFIGURATIONS DEBUG) -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" - IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") - endif() - if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES) - unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES) - foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES}) -- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep}) -+ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep}) - endforeach() - if(COMPONENT STREQUAL "thread") - list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads) - endif() -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}") - endif() - if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES) -- set_target_properties(Boost::${COMPONENT} PROPERTIES -+ set_target_properties(boost_${COMPONENT} PROPERTIES - INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}") - endif() - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1b1f19d464..21c222280f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -353,12 +353,12 @@ set(ceph_common_objs - set(ceph_common_deps - json_spirit erasure_code arch crc32 - ${LIB_RESOLV} -- Boost::thread -- Boost::system -- Boost::random -- Boost::program_options -- Boost::date_time -- Boost::iostreams -+ boost_thread -+ boost_system -+ boost_random -+ boost_program_options -+ boost_date_time -+ boost_iostreams - ${BLKID_LIBRARIES} - ${Backtrace_LIBRARIES} - ${BLKIN_LIBRARIES} -@@ -518,7 +518,7 @@ if (WITH_CEPHFS) - ceph_mds.cc) - add_executable(ceph-mds ${ceph_mds_srcs}) - target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common -- Boost::thread) -+ boost_thread) - install(TARGETS ceph-mds DESTINATION bin) - endif() - -diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt -index d7b58521d4..e1533af33f 100644 ---- a/src/crimson/CMakeLists.txt -+++ b/src/crimson/CMakeLists.txt -@@ -106,8 +106,8 @@ target_link_libraries(crimson-common - PRIVATE - crc32 - crimson::cflags -- Boost::iostreams -- Boost::random -+ boost_iostreams -+ boost_random - ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto) - - set(crimson_auth_srcs -diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt -index 252fb3e5e3..3f3823a68e 100644 ---- a/src/mgr/CMakeLists.txt -+++ b/src/mgr/CMakeLists.txt -@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") - target_link_libraries(ceph-mgr - osdc client heap_profiler - global-static ceph-common -- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} -+ boost_python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR} - ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) - set_target_properties(ceph-mgr PROPERTIES - POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) -diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt -index e9d3804c5f..5c6eb58de1 100644 ---- a/src/rbd_replay/CMakeLists.txt -+++ b/src/rbd_replay/CMakeLists.txt -@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) - global - babeltrace - babeltrace-ctf -- Boost::date_time -+ boost_date_time - ) - install(TARGETS rbd-replay-prep DESTINATION bin) - endif(HAVE_BABELTRACE) -diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt -index ccc4f74cfe..854aa6e5e9 100644 ---- a/src/rgw/CMakeLists.txt -+++ b/src/rgw/CMakeLists.txt -@@ -199,7 +199,7 @@ if(WITH_CURL_OPENSSL) - endif() - - if(WITH_BOOST_CONTEXT) -- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context) -+ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context) - endif() - - set(rgw_libs rgw_a) -@@ -341,7 +341,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT) - target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ) - endif() - if(WITH_BOOST_CONTEXT) -- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context) -+ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context) - endif() - - if(WITH_TESTS) -diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt -index 20a64fd41b..a8bb323614 100644 ---- a/src/test/CMakeLists.txt -+++ b/src/test/CMakeLists.txt -@@ -158,7 +158,7 @@ add_executable(ceph_omapbench - ) - target_link_libraries(ceph_omapbench - librados -- Boost::program_options -+ boost_program_options - global - ${BLKID_LIBRARIES} - ${CMAKE_DL_LIBS} -diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt -index 71fb77cda9..aff8fb6565 100644 ---- a/src/test/common/CMakeLists.txt -+++ b/src/test/common/CMakeLists.txt -@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject) - - add_executable(unittest_async_completion test_async_completion.cc) - add_ceph_unittest(unittest_async_completion) --target_link_libraries(unittest_async_completion Boost::system) -+target_link_libraries(unittest_async_completion boost_system) - - add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc) - add_ceph_unittest(unittest_async_shared_mutex) --target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system) -+target_link_libraries(unittest_async_shared_mutex ceph-common boost_system) -diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt -index 721f6c3675..1cd9635c77 100644 ---- a/src/test/erasure-code/CMakeLists.txt -+++ b/src/test/erasure-code/CMakeLists.txt -@@ -2,15 +2,15 @@ - add_executable(ceph_erasure_code_benchmark - ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc - ceph_erasure_code_benchmark.cc) --target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - install(TARGETS ceph_erasure_code_benchmark - DESTINATION bin) - - add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) --target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - - add_executable(ceph_erasure_code ceph_erasure_code.cc) --target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) - install(TARGETS ceph_erasure_code - DESTINATION bin) - -diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt -index 4fc53d2406..e6304394f8 100644 ---- a/src/test/librados/CMakeLists.txt -+++ b/src/test/librados/CMakeLists.txt -@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc) - target_link_libraries(ceph_test_rados_api_asio global - librados ${UNITTEST_LIBS}) - if(WITH_BOOST_CONTEXT) -- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) -+ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) - endif() - - add_executable(ceph_test_rados_api_list -@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp - tier_cxx.cc - $) - target_link_libraries(ceph_test_rados_api_tier_pp -- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx) -+ librados global ${UNITTEST_LIBS} boost_system radostest-cxx) - - add_executable(ceph_test_rados_api_snapshots - snapshots.cc) -diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt -index 2bf6723c40..e99b8afa11 100644 ---- a/src/test/librbd/CMakeLists.txt -+++ b/src/test/librbd/CMakeLists.txt -@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE - radostest - radostest-cxx - librados -- Boost::thread -+ boost_thread - GMock::GMock - GTest::GTest) - -diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt -index 9b2c6b6321..80e4cb7829 100644 ---- a/src/test/rgw/CMakeLists.txt -+++ b/src/test/rgw/CMakeLists.txt -@@ -143,7 +143,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler) - target_link_libraries(unittest_rgw_dmclock_scheduler ${rgw_libs} dmclock) - if(WITH_BOOST_CONTEXT) - target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) -- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) -+ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context) - endif() - - if(WITH_RADOSGW_AMQP_ENDPOINT) -diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt -index d31f3d2408..6945018b11 100644 ---- a/src/tools/CMakeLists.txt -+++ b/src/tools/CMakeLists.txt -@@ -35,20 +35,20 @@ install(PROGRAMS - endif(WITH_TESTS) - - add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) --target_link_libraries(ceph-osdomap-tool os global Boost::program_options) -+target_link_libraries(ceph-osdomap-tool os global boost_program_options) - install(TARGETS ceph-osdomap-tool DESTINATION bin) - - add_executable(ceph-monstore-tool - ceph_monstore_tool.cc - ../mgr/mgr_commands.cc) --target_link_libraries(ceph-monstore-tool os global Boost::program_options) -+target_link_libraries(ceph-monstore-tool os global boost_program_options) - install(TARGETS ceph-monstore-tool DESTINATION bin) - - add_executable(ceph-objectstore-tool - ceph_objectstore_tool.cc - rebuild_mondb.cc - RadosDump.cc) --target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) -+target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) - if(WITH_FUSE) - target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES}) - endif(WITH_FUSE) diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch new file mode 100644 index 000000000000..860bd9624e89 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.6-python-sonames.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 05d1e61270..8b939b8af6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -640,7 +640,7 @@ set(BOOST_HEADER_COMPONENTS container) + + if(WITH_MGR) + list(APPEND BOOST_COMPONENTS +- python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}) ++ python-${MGR_PYTHON_VERSION_MAJOR}.${MGR_PYTHON_VERSION_MINOR}) + endif() + if(WITH_BOOST_CONTEXT) + list(APPEND BOOST_COMPONENTS context coroutine) +diff --git a/cmake/modules/BuildBoost.cmake b/cmake/modules/BuildBoost.cmake +index f46cc0d485..3cc6340b2c 100644 +--- a/cmake/modules/BuildBoost.cmake ++++ b/cmake/modules/BuildBoost.cmake +@@ -205,7 +205,7 @@ macro(build_boost version) + endif() + add_dependencies(Boost::${c} Boost) + if(c MATCHES "^python") +- set(c "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}") ++ set(c "python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") + endif() + if(Boost_USE_STATIC_LIBS) + set(Boost_${upper_c}_LIBRARY diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch new file mode 100644 index 000000000000..26cea1e394bc --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-1.70.patch @@ -0,0 +1,78 @@ +diff --git a/src/rgw/rgw_asio_frontend.cc b/src/rgw/rgw_asio_frontend.cc +index e4be074ec7..4af3695dc1 100644 +--- a/src/rgw/rgw_asio_frontend.cc ++++ b/src/rgw/rgw_asio_frontend.cc +@@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO { + using SharedMutex = ceph::async::SharedMutex; + + template +-void handle_connection(RGWProcessEnv& env, Stream& stream, ++void handle_connection(boost::asio::io_context& context, ++ RGWProcessEnv& env, Stream& stream, + boost::beast::flat_buffer& buffer, bool is_ssl, + SharedMutex& pause_mutex, + rgw::dmclock::Scheduler *scheduler, +@@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream, + rgw::io::add_conlen_controlling( + &real_client)))); + RGWRestfulIO client(cct, &real_client_io); +- auto y = optional_yield{socket.get_io_context(), yield}; ++ auto y = optional_yield{context, yield}; + process_request(env.store, env.rest, &req, env.uri_prefix, + *env.auth_registry, &client, env.olog, y, scheduler); + } +@@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) + return; + } + buffer.consume(bytes); +- handle_connection(env, stream, buffer, true, pause_mutex, ++ handle_connection(context, env, stream, buffer, true, pause_mutex, + scheduler.get(), ec, yield); + if (!ec) { + // ssl shutdown (ignoring errors) +@@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec) + auto c = connections.add(conn); + boost::beast::flat_buffer buffer; + boost::system::error_code ec; +- handle_connection(env, s, buffer, false, pause_mutex, ++ handle_connection(context, env, s, buffer, false, pause_mutex, + scheduler.get(), ec, yield); + s.shutdown(tcp::socket::shutdown_both, ec); + }); +diff --git a/src/rgw/rgw_dmclock_async_scheduler.h b/src/rgw/rgw_dmclock_async_scheduler.h +index 70487a5253..1d454acd2e 100644 +--- a/src/rgw/rgw_dmclock_async_scheduler.h ++++ b/src/rgw/rgw_dmclock_async_scheduler.h +@@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler { + using Completion = async::Completion>; + + using Clock = ceph::coarse_real_clock; ++#if BOOST_VERSION < 107000 + using Timer = boost::asio::basic_waitable_timer; ++#else ++ using Timer = boost::asio::basic_waitable_timer, executor_type>; ++#endif + Timer timer; //< timer for the next scheduled request + + CephContext *const cct; +diff --git a/src/rgw/rgw_reshard.h b/src/rgw/rgw_reshard.h +index d99a6ff68d..213fc238d2 100644 +--- a/src/rgw/rgw_reshard.h ++++ b/src/rgw/rgw_reshard.h +@@ -183,7 +183,14 @@ class RGWReshardWait { + ceph::condition_variable cond; + + struct Waiter : boost::intrusive::list_base_hook<> { +- boost::asio::basic_waitable_timer timer; ++#if BOOST_VERSION < 107000 ++ using Timer = boost::asio::basic_waitable_timer; ++#else ++ using Executor = boost::asio::io_context::executor_type; ++ using Timer = boost::asio::basic_waitable_timer, Executor>; ++#endif ++ Timer timer; + explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {} + }; + boost::intrusive::list waiters; diff --git a/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch new file mode 100644 index 000000000000..92ca32f5c8e0 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-14.2.3-boost-sonames.patch @@ -0,0 +1,321 @@ +diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake +index dd08ba5e45..19d3b8ad37 100644 +--- a/cmake/modules/FindBoost.cmake ++++ b/cmake/modules/FindBoost.cmake +@@ -1235,10 +1235,10 @@ endif() + # on all platforms to keep end user code free from platform dependent + # code. Also provide convenience targets to disable autolinking and + # enable dynamic linking. +-if(NOT TARGET Boost::diagnostic_definitions) +- add_library(Boost::diagnostic_definitions INTERFACE IMPORTED) +- add_library(Boost::disable_autolinking INTERFACE IMPORTED) +- add_library(Boost::dynamic_linking INTERFACE IMPORTED) ++if(NOT TARGET boost_diagnostic_definitions) ++ add_library(boost_diagnostic_definitions INTERFACE IMPORTED) ++ add_library(boost_disable_autolinking INTERFACE IMPORTED) ++ add_library(boost_dynamic_linking INTERFACE IMPORTED) + endif() + if(WIN32) + # In windows, automatic linking is performed, so you do not have +@@ -1259,11 +1259,11 @@ if(WIN32) + # code to emit a #pragma message each time a library is selected + # for linking. + set(Boost_LIB_DIAGNOSTIC_DEFINITIONS "-DBOOST_LIB_DIAGNOSTIC") +- set_target_properties(Boost::diagnostic_definitions PROPERTIES ++ set_target_properties(boost_diagnostic_definitions PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_LIB_DIAGNOSTIC") +- set_target_properties(Boost::disable_autolinking PROPERTIES ++ set_target_properties(boost_disable_autolinking PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") +- set_target_properties(Boost::dynamic_linking PROPERTIES ++ set_target_properties(boost_dynamic_linking PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "BOOST_ALL_DYN_LINK") + endif() + +@@ -2088,52 +2088,52 @@ if(Boost_FOUND) + endif() + + foreach(COMPONENT ${Boost_FIND_COMPONENTS}) +- if(_Boost_IMPORTED_TARGETS AND NOT TARGET Boost::${COMPONENT}) ++ if(_Boost_IMPORTED_TARGETS AND NOT TARGET boost_${COMPONENT}) + string(TOUPPER ${COMPONENT} UPPERCOMPONENT) + if(Boost_${UPPERCOMPONENT}_FOUND) + if(Boost_USE_STATIC_LIBS) +- add_library(Boost::${COMPONENT} STATIC IMPORTED) ++ add_library(boost_${COMPONENT} STATIC IMPORTED) + else() + # Even if Boost_USE_STATIC_LIBS is OFF, we might have static + # libraries as a result. +- add_library(Boost::${COMPONENT} UNKNOWN IMPORTED) ++ add_library(boost_${COMPONENT} UNKNOWN IMPORTED) + endif() + if(Boost_INCLUDE_DIRS) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${Boost_INCLUDE_DIRS}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY}") +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" + IMPORTED_LOCATION "${Boost_${UPPERCOMPONENT}_LIBRARY}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") +- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY ++ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY + IMPORTED_CONFIGURATIONS RELEASE) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE "CXX" + IMPORTED_LOCATION_RELEASE "${Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE}") + endif() + if(EXISTS "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") +- set_property(TARGET Boost::${COMPONENT} APPEND PROPERTY ++ set_property(TARGET boost_${COMPONENT} APPEND PROPERTY + IMPORTED_CONFIGURATIONS DEBUG) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX" + IMPORTED_LOCATION_DEBUG "${Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG}") + endif() + if(_Boost_${UPPERCOMPONENT}_DEPENDENCIES) + unset(_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES) + foreach(dep ${_Boost_${UPPERCOMPONENT}_DEPENDENCIES}) +- list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Boost::${dep}) ++ list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES boost_${dep}) + endforeach() + if(COMPONENT STREQUAL "thread") + list(APPEND _Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES Threads::Threads) + endif() +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_LINK_LIBRARIES "${_Boost_${UPPERCOMPONENT}_TARGET_DEPENDENCIES}") + endif() + if(_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES) +- set_target_properties(Boost::${COMPONENT} PROPERTIES ++ set_target_properties(boost_${COMPONENT} PROPERTIES + INTERFACE_COMPILE_FEATURES "${_Boost_${UPPERCOMPONENT}_COMPILER_FEATURES}") + endif() + endif() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4895e84df6..55814e3b96 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -356,12 +356,12 @@ set(ceph_common_objs + set(ceph_common_deps + json_spirit erasure_code arch crc32 + ${LIB_RESOLV} +- Boost::thread +- Boost::system +- Boost::random +- Boost::program_options +- Boost::date_time +- Boost::iostreams ++ boost_thread ++ boost_system ++ boost_random ++ boost_program_options ++ boost_date_time ++ boost_iostreams + ${BLKID_LIBRARIES} + ${Backtrace_LIBRARIES} + ${BLKIN_LIBRARIES} +@@ -522,7 +522,7 @@ if (WITH_CEPHFS) + ceph_mds.cc) + add_executable(ceph-mds ${ceph_mds_srcs}) + target_link_libraries(ceph-mds mds ${CMAKE_DL_LIBS} global-static ceph-common +- Boost::thread) ++ boost_thread) + install(TARGETS ceph-mds DESTINATION bin) + endif() + +diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt +index d7b58521d4..e1533af33f 100644 +--- a/src/crimson/CMakeLists.txt ++++ b/src/crimson/CMakeLists.txt +@@ -106,8 +106,8 @@ target_link_libraries(crimson-common + PRIVATE + crc32 + crimson::cflags +- Boost::iostreams +- Boost::random ++ boost_iostreams ++ boost_random + ${NSS_LIBRARIES} ${NSPR_LIBRARIES} OpenSSL::Crypto) + + set(crimson_auth_srcs +diff --git a/src/mgr/CMakeLists.txt b/src/mgr/CMakeLists.txt +index 252fb3e5e3..213482da16 100644 +--- a/src/mgr/CMakeLists.txt ++++ b/src/mgr/CMakeLists.txt +@@ -26,7 +26,7 @@ target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}") + target_link_libraries(ceph-mgr + osdc client heap_profiler + global-static ceph-common +- Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} ++ boost_python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} + ${MGR_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS} ${GSSAPI_LIBRARIES}) + set_target_properties(ceph-mgr PROPERTIES + POSITION_INDEPENDENT_CODE ${EXE_LINKER_USE_PIE}) +diff --git a/src/rbd_replay/CMakeLists.txt b/src/rbd_replay/CMakeLists.txt +index e9d3804c5f..5c6eb58de1 100644 +--- a/src/rbd_replay/CMakeLists.txt ++++ b/src/rbd_replay/CMakeLists.txt +@@ -36,7 +36,7 @@ if(HAVE_BABELTRACE) + global + babeltrace + babeltrace-ctf +- Boost::date_time ++ boost_date_time + ) + install(TARGETS rbd-replay-prep DESTINATION bin) + endif(HAVE_BABELTRACE) +diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt +index 8d5b0638a0..a147c55bc3 100644 +--- a/src/rgw/CMakeLists.txt ++++ b/src/rgw/CMakeLists.txt +@@ -196,7 +196,7 @@ if(WITH_CURL_OPENSSL) + endif() + + if(WITH_BOOST_CONTEXT) +- target_link_libraries(rgw_a PRIVATE Boost::coroutine Boost::context) ++ target_link_libraries(rgw_a PRIVATE boost_coroutine boost_context) + endif() + + set(rgw_libs rgw_a) +@@ -347,7 +347,7 @@ if(WITH_RADOSGW_AMQP_ENDPOINT) + target_link_libraries(rgw_admin_user PRIVATE RabbitMQ::RabbitMQ) + endif() + if(WITH_BOOST_CONTEXT) +- target_link_libraries(rgw_admin_user PRIVATE Boost::coroutine Boost::context) ++ target_link_libraries(rgw_admin_user PRIVATE boost_coroutine boost_context) + endif() + + if(WITH_TESTS) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 5dcee1694d..60743be698 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -159,7 +159,7 @@ add_executable(ceph_omapbench + ) + target_link_libraries(ceph_omapbench + librados +- Boost::program_options ++ boost_program_options + global + ${BLKID_LIBRARIES} + ${CMAKE_DL_LIBS} +diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt +index 71fb77cda9..aff8fb6565 100644 +--- a/src/test/common/CMakeLists.txt ++++ b/src/test/common/CMakeLists.txt +@@ -315,8 +315,8 @@ add_ceph_unittest(unittest_hobject) + + add_executable(unittest_async_completion test_async_completion.cc) + add_ceph_unittest(unittest_async_completion) +-target_link_libraries(unittest_async_completion Boost::system) ++target_link_libraries(unittest_async_completion boost_system) + + add_executable(unittest_async_shared_mutex test_async_shared_mutex.cc) + add_ceph_unittest(unittest_async_shared_mutex) +-target_link_libraries(unittest_async_shared_mutex ceph-common Boost::system) ++target_link_libraries(unittest_async_shared_mutex ceph-common boost_system) +diff --git a/src/test/erasure-code/CMakeLists.txt b/src/test/erasure-code/CMakeLists.txt +index 721f6c3675..1cd9635c77 100644 +--- a/src/test/erasure-code/CMakeLists.txt ++++ b/src/test/erasure-code/CMakeLists.txt +@@ -2,15 +2,15 @@ + add_executable(ceph_erasure_code_benchmark + ${CMAKE_SOURCE_DIR}/src/erasure-code/ErasureCode.cc + ceph_erasure_code_benchmark.cc) +-target_link_libraries(ceph_erasure_code_benchmark ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code_benchmark ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + install(TARGETS ceph_erasure_code_benchmark + DESTINATION bin) + + add_executable(ceph_erasure_code_non_regression ceph_erasure_code_non_regression.cc) +-target_link_libraries(ceph_erasure_code_non_regression ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code_non_regression ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + + add_executable(ceph_erasure_code ceph_erasure_code.cc) +-target_link_libraries(ceph_erasure_code ceph-common Boost::program_options global ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph_erasure_code ceph-common boost_program_options global ${CMAKE_DL_LIBS}) + install(TARGETS ceph_erasure_code + DESTINATION bin) + +diff --git a/src/test/librados/CMakeLists.txt b/src/test/librados/CMakeLists.txt +index 4fc53d2406..e6304394f8 100644 +--- a/src/test/librados/CMakeLists.txt ++++ b/src/test/librados/CMakeLists.txt +@@ -62,7 +62,7 @@ add_executable(ceph_test_rados_api_asio asio.cc) + target_link_libraries(ceph_test_rados_api_asio global + librados ${UNITTEST_LIBS}) + if(WITH_BOOST_CONTEXT) +- target_link_libraries(ceph_test_rados_api_asio Boost::coroutine Boost::context) ++ target_link_libraries(ceph_test_rados_api_asio boost_coroutine boost_context) + endif() + + add_executable(ceph_test_rados_api_list +@@ -132,7 +132,7 @@ add_executable(ceph_test_rados_api_tier_pp + tier_cxx.cc + $) + target_link_libraries(ceph_test_rados_api_tier_pp +- librados global ${UNITTEST_LIBS} Boost::system radostest-cxx) ++ librados global ${UNITTEST_LIBS} boost_system radostest-cxx) + + add_executable(ceph_test_rados_api_snapshots + snapshots.cc) +diff --git a/src/test/librbd/CMakeLists.txt b/src/test/librbd/CMakeLists.txt +index 3988e94bd3..b2a720b8a0 100644 +--- a/src/test/librbd/CMakeLists.txt ++++ b/src/test/librbd/CMakeLists.txt +@@ -27,7 +27,7 @@ target_link_libraries(rbd_test PRIVATE + radostest + radostest-cxx + librados +- Boost::thread ++ boost_thread + GMock::GMock + GTest::GTest) + +diff --git a/src/test/rgw/CMakeLists.txt b/src/test/rgw/CMakeLists.txt +index 36df883a66..43d3456089 100644 +--- a/src/test/rgw/CMakeLists.txt ++++ b/src/test/rgw/CMakeLists.txt +@@ -144,7 +144,7 @@ add_ceph_unittest(unittest_rgw_dmclock_scheduler) + target_link_libraries(unittest_rgw_dmclock_scheduler radosgw_a dmclock) + if(WITH_BOOST_CONTEXT) + target_compile_definitions(unittest_rgw_dmclock_scheduler PRIVATE BOOST_COROUTINES_NO_DEPRECATION_WARNING) +- target_link_libraries(unittest_rgw_dmclock_scheduler Boost::coroutine Boost::context) ++ target_link_libraries(unittest_rgw_dmclock_scheduler boost_coroutine boost_context) + endif() + + if(WITH_RADOSGW_AMQP_ENDPOINT) +diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt +index d31f3d2408..6945018b11 100644 +--- a/src/tools/CMakeLists.txt ++++ b/src/tools/CMakeLists.txt +@@ -35,20 +35,20 @@ install(PROGRAMS + endif(WITH_TESTS) + + add_executable(ceph-osdomap-tool ceph_osdomap_tool.cc) +-target_link_libraries(ceph-osdomap-tool os global Boost::program_options) ++target_link_libraries(ceph-osdomap-tool os global boost_program_options) + install(TARGETS ceph-osdomap-tool DESTINATION bin) + + add_executable(ceph-monstore-tool + ceph_monstore_tool.cc + ../mgr/mgr_commands.cc) +-target_link_libraries(ceph-monstore-tool os global Boost::program_options) ++target_link_libraries(ceph-monstore-tool os global boost_program_options) + install(TARGETS ceph-monstore-tool DESTINATION bin) + + add_executable(ceph-objectstore-tool + ceph_objectstore_tool.cc + rebuild_mondb.cc + RadosDump.cc) +-target_link_libraries(ceph-objectstore-tool osd os global Boost::program_options ${CMAKE_DL_LIBS}) ++target_link_libraries(ceph-objectstore-tool osd os global boost_program_options ${CMAKE_DL_LIBS}) + if(WITH_FUSE) + target_link_libraries(ceph-objectstore-tool ${FUSE_LIBRARIES}) + endif(WITH_FUSE) -- cgit v1.2.3