Date: Tue, 18 May 2021 00:48:38 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 61d3e84e0d63 - 2021Q2 - net/ceph14: update to 14.2.21 release Message-ID: <202105180048.14I0mcNg033454@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=61d3e84e0d6371269214ee5f6dc4c944cf30e5fa commit 61d3e84e0d6371269214ee5f6dc4c944cf30e5fa Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2021-05-18 00:45:57 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> CommitDate: 2021-05-18 00:48:21 +0000 net/ceph14: update to 14.2.21 release Introduce option WITH_TESTS which covers all test/debug tools. Currently disabled due to linking errors PR: 255763 (based on) Approved by: maintainer (implicit) (cherry picked from commit 67ce935d463c530750afb8e4485c83aeb7bc30f8) --- net/ceph14/Makefile | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index 0b3fba537051..9badb3c7dbec 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -2,8 +2,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 14.2.11 -PORTREVISION= 3 +DISTVERSION= 14.2.21 CATEGORIES= net PKGNAMESUFFIX= 14 @@ -27,7 +26,6 @@ BUILD_DEPENDS= \ LIB_DEPENDS= \ ${PY_BOOST} \ libboost_thread.so:devel/boost-libs \ - libleveldb.so:databases/leveldb \ libnss3.so:security/nss \ libcryptopp.so:security/cryptopp \ liboath.so:security/oath-toolkit \ @@ -40,6 +38,7 @@ LIB_DEPENDS= \ libtcmalloc.so:devel/google-perftools \ librabbitmq.so:net/rabbitmq-c \ libfmt.so:devel/libfmt +# libleveldb.so:databases/leveldb \ RUN_DEPENDS= \ bash:shells/bash \ flock:sysutils/flock \ @@ -62,7 +61,7 @@ RUN_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR} USES= cmake:noninja compiler:c++17-lang dos2unix fuse gettext-runtime gmake ncurses \ - pkgconfig python:3.7+ shebangfix ssl + pkgconfig python:3.7+ readline shebangfix ssl USE_PYTHON= cython py3kplist USE_OPENLDAP= yes USE_GITHUB= yes @@ -86,20 +85,29 @@ GH_TUPLE+= ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson GH_TUPLE+= ceph:rocksdb:4c736f1:rocksdb/src/rocksdb GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd -# GH_TUPLE+= ceph:seastar:0cf6aa6:seastar/src/seastar +GH_TUPLE+= ceph:spawn:5f4742f:spawn/src/spawn + +OPTIONS_DEFINE= TESTS +OPTIONS_SUB= yes CMAKE_BUILD_TYPE= Release CMAKE_ON= WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3 -CMAKE_OFF= WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS \ +CMAKE_OFF= WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS WITH_LEVELDB \ WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 \ - WITH_RADOSGW_KAFKA_ENDPOINT -CMAKE_ARGS= -D MGR_PYTHON_VERSION=${PYTHON_VER} \ - -D CEPH_MAN_DIR:STRING=man + WITH_RADOSGW_KAFKA_ENDPOINT WITH_LEVELDB +CMAKE_ARGS= -DMGR_PYTHON_VERSION=${PYTHON_VER} \ + -DCEPH_MAN_DIR:STRING=man SHEBANG_FILES= src/rbdmap src/ceph-post-file.in src/rbd-replay-many \ src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \ src/ceph-create-keys +TESTS_DESC= Build test/debug tools (Broken with Clang) +TESTS_CMAKE_ON= -DWITH_TESTS:BOOL=ON +TESTS_CMAKE_OFF=-DWITH_TESTS:BOOL=OFF + +USE_CXXSTD= gnu++17 + USE_RC_SUBR= ceph USE_LDCONFIG= yes @@ -123,6 +131,8 @@ pre-configure: ${CP} files/file-git_version ${WRKSRC}/src/.git_version # Use the module finders that come with Cmake for Boost and Python ${RM} ${WRKSRC}/cmake/modules/FindBoost.cmake || true + # Cleanup after patching + ${RM} ${WRKSRC}/src/pybind/mgr/diskprediction_cloud/common/__init__.py.orig post-install: # To install a ceph.conf sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105180048.14I0mcNg033454>