[packages/ceph] - added accelio bcond

qboosh qboosh at pld-linux.org
Fri Jun 19 21:40:19 CEST 2015


commit 477a1b20e2e03ba11fff9142c4bd0f58ac0b0c87
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jun 19 21:41:41 2015 +0200

    - added accelio bcond

 ceph.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/ceph.spec b/ceph.spec
index 1c32965..94cc015 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,5 +1,4 @@
 # TODO:
-#	- accelio libxio (BR: accelio libibverbs-devel librdmacm-devel
 #	- proper init scripts if non-systemd boot is too be supported
 #         (upstream scripts seem overcomplicated and hardly useful)
 #	- run as non-root user
@@ -7,6 +6,7 @@
 #
 # Conditional build:
 %bcond_without	java		# Java binding
+%bcond_with	accelio		# Accelio transport support
 %bcond_with	kinetic		# Kinetic storage support [needs update for internal API changes]
 %bcond_with	rocksdb		# RocksDB storage support [needs update for internal API changes]
 %bcond_with	zfs		# ZFS support
@@ -41,6 +41,7 @@ Patch2:		%{name}-link.patch
 Patch3:		%{name}-ac.patch
 Patch4:		%{name}-boost.patch
 URL:		http://ceph.com/
+%{?with_accelio:BuildRequires:	accelio-devel}
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 %{?with_babeltrace:BuildRequires:	babeltrace-devel}
@@ -60,7 +61,9 @@ BuildRequires:	libatomic_ops
 BuildRequires:	libblkid-devel >= 2.17
 BuildRequires:	libedit-devel >= 2.11
 BuildRequires:	libfuse-devel
+%{?with_accelio:BuildRequires:	libibverbs-devel}
 BuildRequires:	libltdl-devel
+%{?with_accelio:BuildRequires:	librdmacm-devel}
 BuildRequires:	libs3-devel
 BuildRequires:	libstdc++-devel
 %{?with_tcmalloc:BuildRequires:	libtcmalloc-devel}
@@ -242,7 +245,8 @@ Agenci OCF do monitorowania procesów Cepha.
 	--with-system-leveldb \
 	--with-system-libs3 \
 	%{?with_java:--enable-cephfs-java --with-jdk-dir=%{_jvmdir}/java} \
-	--disable-silent-rules
+	--disable-silent-rules \
+	%{?with_accelio:--enable-xio}
 
 %{__make} -j1
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/477a1b20e2e03ba11fff9142c4bd0f58ac0b0c87



More information about the pld-cvs-commit mailing list