From: Patrick McLean Date: Mon, 15 Apr 2019 23:26:37 +0000 (-0700) Subject: sys-cluster/ceph: Revbumps, 681068, 651460, 671482, 682664, 638750 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9c1469bcc815ad185bba2b5300887a3a142e8603;p=gentoo.git sys-cluster/ceph: Revbumps, 681068, 651460, 671482, 682664, 638750 Cleanups for a lot of old bugs that had fallen through the cracks/ Closes: https://bugs.gentoo.org/681068 Closes: https://bugs.gentoo.org/651460 Closes: https://bugs.gentoo.org/671482 Closes: https://bugs.gentoo.org/682664 Closes: https://bugs.gentoo.org/638750 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Patrick McLean --- diff --git a/sys-cluster/ceph/ceph-12.2.12.ebuild b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild similarity index 96% rename from sys-cluster/ceph/ceph-12.2.12.ebuild rename to sys-cluster/ceph/ceph-12.2.12-r1.ebuild index 002e685d77b8..b9a012001e41 100644 --- a/sys-cluster/ceph/ceph-12.2.12.ebuild +++ b/sys-cluster/ceph/ceph-12.2.12-r1.ebuild @@ -81,7 +81,6 @@ DEPEND="${COMMON_DEPEND} sys-devel/bc virtual/pkgconfig test? ( - dev-python/tox[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] sys-apps/grep[pcre] sys-fs/btrfs-progs @@ -121,8 +120,6 @@ CMAKE_WARN_UNUSED_CLI="no" # ninja does not work at all CMAKE_MAKEFILE_GENERATOR="emake" -STRIP_MASK="/usr/lib*/rados-classes/*" - UNBUNDLE_LIBS=( src/erasure-code/jerasure/jerasure src/erasure-code/jerasure/gf-complete @@ -141,6 +138,7 @@ PATCHES=( "${FILESDIR}/ceph-12.2.12-dont-use-bad-namespace.patch" "${FILESDIR}/ceph-12.2.12-civetweb-openssl-1.1.1.patch" "${FILESDIR}/ceph-12.2.12-qa-warning.patch" + "${FILESDIR}/ceph-12.2.12-ncurses-tinfo.patch" ) check-reqs_export_vars() { @@ -189,7 +187,7 @@ ceph_src_configure() { local flag local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${P}" + -DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PN}-${PVR}" -DWITH_BABELTRACE=$(usex babeltrace) -DWITH_CEPHFS=$(usex cephfs) -DWITH_FUSE=$(usex fuse) @@ -204,7 +202,7 @@ ceph_src_configure() { -DWITH_XFS=$(usex xfs) -DWITH_ZFS=$(usex zfs) -DENABLE_SHARED=$(usex static-libs '' 'yes' 'no') - -DALLOCATOR=$(usex tcmalloc 'tcmalloc' '' "$(usex jemalloc 'jemalloc' '' 'libc' '')" '') + -DALLOCATOR=$(usex tcmalloc 'tcmalloc' "$(usex jemalloc 'jemalloc' 'libc')") -DWITH_SYSTEM_BOOST=$(usex system-boost) -DBOOST_J=$(makeopts_jobs) -DWITH_RDMA=no @@ -258,7 +256,7 @@ src_test() { python_install() { local CMAKE_USE_DIR="${S}" pushd "${BUILD_DIR}/src/pybind" >/dev/null || die - DESTDIR="${D}" emake install + DESTDIR="${ED}" emake install popd >/dev/null || die } @@ -312,6 +310,9 @@ src_install() { # 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/ceph-disk,bin/ceph-detect-init} || die "sed failed" + + local -a rados_classes=( "${D}/usr/$(get_libdir)/rados-classes"/* ) + dostrip -x "${rados_classes[@]#${D}}" } pkg_postinst() { diff --git a/sys-cluster/ceph/ceph-13.2.5-r2.ebuild b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild similarity index 94% rename from sys-cluster/ceph/ceph-13.2.5-r2.ebuild rename to sys-cluster/ceph/ceph-13.2.5-r3.ebuild index 2ef0f19a4010..c426116b1e6b 100644 --- a/sys-cluster/ceph/ceph-13.2.5-r2.ebuild +++ b/sys-cluster/ceph/ceph-13.2.5-r3.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) 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 +inherit check-reqs cmake-utils distutils-r1 flag-o-matic multiprocessing \ + python-r1 udev user readme.gentoo-r1 systemd if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -93,7 +92,6 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig test? ( dev-python/coverage[${PYTHON_USEDEP}] - dev-python/tox[${PYTHON_USEDEP}] dev-python/virtualenv[${PYTHON_USEDEP}] sys-apps/grep[pcre] sys-fs/btrfs-progs @@ -103,7 +101,7 @@ RDEPEND="${COMMON_DEPEND} sys-apps/gptfdisk sys-block/parted sys-fs/cryptsetup - sys-fs/lvm2 + sys-fs/lvm2[-device-mapper-only(-)] ! +Date: Mon, 8 Apr 2019 16:34:53 +0200 +Subject: [PATCH] cmake: Fix build against ncurses with separate libtinfo + +Signed-off-by: Lars Wendler +--- + src/tools/rbd/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/tools/rbd/CMakeLists.txt b/src/tools/rbd/CMakeLists.txt +index 36b2408a8d28..0e38a033ff55 100644 +--- a/src/tools/rbd/CMakeLists.txt ++++ b/src/tools/rbd/CMakeLists.txt +@@ -1,3 +1,6 @@ ++set(CURSES_NEED_NCURSES TRUE) ++find_package(Curses REQUIRED) ++ + set(rbd_srcs + rbd.cc + ArgumentTypes.cc +@@ -52,7 +55,7 @@ target_link_libraries(rbd librbd librados + cls_journal_client cls_rbd_client + rbd_types + journal +- ceph-common global ncurses ++ ceph-common global ${CURSES_LIBRARIES} + ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS}) + if(WITH_KRBD) + target_link_libraries(rbd