From 30357bcfcd4a7c92e0e59ff58a26d48c8416c564 Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Tue, 6 Jan 2015 15:12:59 +0530 Subject: build, glusterd: Add liburcu to build system This patch adds liburcu related checks to the build system and updates the spec file to require 'userspace-rcu'. liburcu >= 0.7 is required to build GlusterFS, but 0.8 and above is preferred. For cases when liburcu 0.7.x is the available version, some function definitions (currently just one) from liburcu-0.8.6 have been made available in /contrib/userspace-rcu/. This change was developed on the git branch at [1]. This commit is a combination of the following commits on the development branch. a5cd6bd Add userspace-rcu checks to configure.ac fe5ced3 Add URCU libs to glusterd libtool flags 1e43302 Add local definition of cds_list_add_tail_rcu for liburcu-0.7 98da755 Move local definition of cds_list_add_tail_rcu into contrib 8c44dfd Update spec file to include userspace-rcu0466e33 Rename rculist-additional.h to rculist-extra.h 947c7b3 Add rculist-extra.h to dist 19f32ad Address review comments 9605/1 [1]: https://github.com/kshlm/glusterfs/tree/urcu Change-Id: Ifbb617d0dacce8fa01214f894badb9d8cdcaf56f BUG: 1191030 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.org/9605 Tested-by: Gluster Build System Reviewed-by: Atin Mukherjee Reviewed-by: Niels de Vos Reviewed-by: Krishnan Parthasarathi Tested-by: Krishnan Parthasarathi --- glusterfs.spec.in | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'glusterfs.spec.in') diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 1b163245f68..70ea5332738 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -197,6 +197,7 @@ BuildRequires: libaio-devel BuildRequires: python-devel BuildRequires: python-ctypes BuildRequires: cmockery2-devel +BuildRequires: userspace-rcu-devel >= 0.7 %if ( 0%{!?_without_systemtap:1} ) BuildRequires: systemtap-sdt-devel %endif @@ -1038,6 +1039,9 @@ fi %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %changelog +* Wed Feb 18 2015 Kaushal M +- add userspace-rcu as a requirement + * Fri Feb 13 2015 Gaurav Kumar Garg - .cmd_log_history file should be renamed to cmd_history.log post upgrade (#1165996) -- cgit