Attachment 212253 Details for Bug 244675 – Enable the building of libcephfs.so

[patch] Enable the building of libcephfs.so

ceph14-14.2.7_2.diff (text/plain), 7.13 KB, created by Willem Jan Withagen on 2020-03-08 12:15:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Willem Jan Withagen

Created: 2020-03-08 12:15:11 UTC

Size: 7.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 527902)
>+++ Makefile	(working copy)
>@@ -4,7 +4,7 @@
> PORTNAME=	ceph
> DISTVERSIONPREFIX=	v
> DISTVERSION=	14.2.7
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net
> PKGNAMESUFFIX=	14
> 
>@@ -44,15 +44,14 @@
> 	bash:shells/bash \
> 	flock:sysutils/flock \
> 	jq:textproc/jq \
>+	smartctl:sysutils/smartmontools \
> 	xml:textproc/xmlstarlet \
> 	${LOCALBASE}/bin/getopt:misc/getopt \
>-	${LOCALBASE}/sbin/smartctl:sysutils/smartmontools \
> 	${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \
>-	${PYTHON_PKGNAMEPREFIX}scipy>=0:science/py-scipy@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
> 	${PYTHON_PKGNAMEPREFIX}pyjwt>=0:www/py-pyjwt@${PY_FLAVOR} \
>@@ -64,7 +63,7 @@
> 
> USES=		cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \
> 		pkgconfig python:3.7+ shebangfix ssl
>-USE_PYTHON=	cython
>+USE_PYTHON=	cython py3kplist
> USE_OPENLDAP=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	ceph:DEFAULT
>@@ -91,9 +90,7 @@
> 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 \
>-		WITH_SPDK WITH_RDMA WITH_RADOSGW_BEAST_FRONTEND \
>-		WITH_MGR_DASHBOARD_FRONTEND WITH_SYSTEM_NPM \
>-		WITH_LIBCEPHFS WITH_CEPHFS WITH_PYTHON2
>+		WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2
> CMAKE_ARGS=	-D MGR_PYTHON_VERSION=${PYTHON_VER} \
> 		-D CEPH_MAN_DIR:STRING=man
> 
>@@ -124,6 +121,8 @@
> pre-configure:
> 	[ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
> 	${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
> 
> post-install:
> 	# To install a ceph.conf sample
>Index: files/patch-cmake_modules_FindPtyhon3Interp.cmake.diff
>===================================================================
>--- files/patch-cmake_modules_FindPtyhon3Interp.cmake.diff	(nonexistent)
>+++ files/patch-cmake_modules_FindPtyhon3Interp.cmake.diff	(working copy)
>@@ -0,0 +1,14 @@
>+
>+index a1d076fbce..ea4ad6cb6f 100644
>+--- cmake/modules/FindPython3Interp.cmake
>++++ cmake/modules/FindPython3Interp.cmake
>+@@ -69,7 +69,7 @@
>+
>+ unset(_Python3_NAMES)
>+
>+-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
>++set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
>+
>+ if(Python3Interp_FIND_VERSION)
>+     if(Python3Interp_FIND_VERSION_COUNT GREATER 1)
>+
>
>Property changes on: files/patch-cmake_modules_FindPtyhon3Interp.cmake.diff
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_CMakeLists.txt.2
>===================================================================
>--- files/patch-src_CMakeLists.txt.2	(nonexistent)
>+++ files/patch-src_CMakeLists.txt.2	(working copy)
>@@ -0,0 +1,13 @@
>+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
>+index 28ec9835f8..4ac08f9d00 100644
>+--- src/CMakeLists.txt
>++++ src/CMakeLists.txt
>+@@ -625,8 +625,6 @@ add_subdirectory(bash_completion)
>+ add_subdirectory(client)
>+ 
>+ if(WITH_LIBCEPHFS)
>+-  find_package(PkgConfig QUIET REQUIRED)
>+-  pkg_check_modules(CAPNG REQUIRED libcap-ng)
>+   set(libcephfs_srcs libcephfs.cc)
>+   add_library(cephfs ${CEPH_SHARED} ${libcephfs_srcs})
>+   target_link_libraries(cephfs PRIVATE client ceph-common
>
>Property changes on: files/patch-src_CMakeLists.txt.2
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 527902)
>+++ pkg-message	(working copy)
>@@ -6,8 +6,9 @@
> into a package but will require the user to install it himself.
> 
> To install the dashboard, please execute:
>+    sudo pkg install python2
>     sudo pkg install npm
>-    cd /usr/local/share/ceph/mgr/dashboard/frontend
>+    cd ${LOCALBASE}/share/ceph/mgr/dashboard/frontend
>     chown -R ceph .
>     ls -asl /var/lib/ceph
>     chown -R ceph:ceph /var/lib/ceph
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 527902)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,8 @@
>+/you/have/to/check/what/makeplist/gives/you
> bin/ceph
> bin/ceph-authtool
> bin/ceph-bluestore-tool
>+bin/ceph-client-debug
> bin/ceph-clsinfo
> bin/ceph-conf
> bin/ceph-coverage
>@@ -16,12 +18,13 @@
> bin/ceph-objectstore-tool
> bin/ceph-osd
> bin/ceph-osdomap-tool
>-bin/ceph_kvstorebench
> bin/ceph-post-file
> bin/ceph-rbdnamer
> bin/ceph-run
>+bin/ceph-syn
> bin/ceph_erasure_code
> bin/ceph_erasure_code_benchmark
>+bin/ceph_kvstorebench
> bin/ceph_objectstore_bench
> bin/ceph_omapbench
> bin/ceph_radosacl
>@@ -29,6 +32,9 @@
> bin/ceph_rgw_multiparser
> bin/ceph_scratchtool
> bin/cephdeduptool
>+bin/cephfs-data-scan
>+bin/cephfs-journal-tool
>+bin/cephfs-table-tool
> bin/crushtool
> bin/init-ceph
> bin/librados-config
>@@ -53,6 +59,8 @@
> etc/bash_completion.d/rbd
> %%ETCDIR%%/ceph.conf.sample
> etc/newsyslog.conf.d/file-newsyslog_ceph-log.conf
>+include/cephfs/ceph_statx.h
>+include/cephfs/libcephfs.h
> include/rados/buffer.h
> include/rados/buffer_fwd.h
> include/rados/crc32c.h
>@@ -101,6 +109,9 @@
> lib/ceph/erasure-code/libec_shec_sse3.so
> lib/ceph/erasure-code/libec_shec_sse4.so
> lib/ceph/libceph-common.so.0
>+lib/libcephfs.so
>+lib/libcephfs.so.2
>+lib/libcephfs.so.2.0.0
> lib/librados.so
> lib/librados.so.2
> lib/librados.so.2.0.0
>@@ -259,6 +270,11 @@
> %%PYTHON_SITELIBDIR%%/ceph_volume/util/system.py
> %%PYTHON_SITELIBDIR%%/ceph_volume/util/templates.py
> %%PYTHON_SITELIBDIR%%/ceph_volume_client.py
>+%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
>+%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
>+%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>+%%PYTHON_SITELIBDIR%%/cephfs-2.0.0-py%%PYTHON_VER%%.egg-info/top_level.txt
>+%%PYTHON_SITELIBDIR%%/cephfs.so
> %%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
> %%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
> %%PYTHON_SITELIBDIR%%/rados-2.0.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
>@@ -277,6 +293,9 @@
> lib/rados-classes/libcls_cas.so
> lib/rados-classes/libcls_cas.so.1
> lib/rados-classes/libcls_cas.so.1.0.0
>+lib/rados-classes/libcls_cephfs.so
>+lib/rados-classes/libcls_cephfs.so.1
>+lib/rados-classes/libcls_cephfs.so.1.0.0
> lib/rados-classes/libcls_hello.so
> lib/rados-classes/libcls_hello.so.1
> lib/rados-classes/libcls_hello.so.1.0.0

Actions: View | Diff

Attachments on bug 244675: 212253 | 213333