From owner-dev-commits-ports-main@freebsd.org Tue May 18 00:46:32 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6A8BF637EA0; Tue, 18 May 2021 00:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fkckw2YP6z3GlW; Tue, 18 May 2021 00:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A77E1604C; Tue, 18 May 2021 00:46:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14I0kWKD033159; Tue, 18 May 2021 00:46:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14I0kWli033158; Tue, 18 May 2021 00:46:32 GMT (envelope-from git) Date: Tue, 18 May 2021 00:46:32 GMT Message-Id: <202105180046.14I0kWli033158@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 67ce935d463c - main - net/ceph14: update to 14.2.21 release MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67ce935d463c530750afb8e4485c83aeb7bc30f8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 May 2021 00:46:32 -0000 The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=67ce935d463c530750afb8e4485c83aeb7bc30f8 commit 67ce935d463c530750afb8e4485c83aeb7bc30f8 Author: Dima Panov AuthorDate: 2021-05-18 00:45:57 +0000 Commit: Dima Panov CommitDate: 2021-05-18 00:45:57 +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) --- net/ceph14/Makefile | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile index d022c1113ac3..9badb3c7dbec 100644 --- a/net/ceph14/Makefile +++ b/net/ceph14/Makefile @@ -2,8 +2,7 @@ PORTNAME= ceph DISTVERSIONPREFIX= v -DISTVERSION= 14.2.11 -PORTREVISION= 4 +DISTVERSION= 14.2.21 CATEGORIES= net PKGNAMESUFFIX= 14 @@ -13,8 +12,6 @@ COMMENT= Ceph delivers object, block, and file storage in a unified system LICENSE= GPLv2 LGPL3 LICENSE_COMB= dual -BROKEN= does not link: undefined reference to `typeinfo for leveldb::Logger' - # even though i386 will build, it is not really advised. ONLY_FOR_ARCHS= amd64 powerpc64 powerpc64le @@ -29,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 \ @@ -42,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 \ @@ -64,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 @@ -88,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 @@ -125,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