[packages/glusterfs] - sysctl is not used on linux, don't include sysctl.h (breaks x32 build)

[baggins]

commit 69c02f38cf07749cc890cf4dcf4637ff28e5c188
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Dec 30 19:52:12 2014 +0000

    - sysctl is not used on linux, don't include sysctl.h (breaks x32 build)

 glusterfs.spec           |  2 ++
 no-sysctl-on-linux.patch | 11 +++++++++++
 2 files changed, 13 insertions(+)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 35cb230..b57fc26 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -23,6 +23,7 @@ Source0:	http://download.gluster.org/pub/gluster/glusterfs/3.5/LATEST/glusterfs-
 Source1:	glusterfsd.init
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-noquiet.patch
+Patch2:		no-sysctl-on-linux.patch
 URL:		http://www.gluster.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -192,6 +193,7 @@ Agenci OCF do monitorowania procesów GlusterFS-a.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/no-sysctl-on-linux.patch b/no-sysctl-on-linux.patch
new file mode 100644
index 0000000..f5f9ec5
--- /dev/null
+++ b/no-sysctl-on-linux.patch
@@ -0,0 +1,11 @@
+--- glusterfs-3.5.3/xlators/mount/fuse/src/fuse-helpers.c~	2014-11-12 13:51:20.000000000 +0000
++++ glusterfs-3.5.3/xlators/mount/fuse/src/fuse-helpers.c	2014-12-30 19:46:36.645378934 +0000
+@@ -14,7 +14,7 @@
+ #include "fuse-bridge.h"
+ #if defined(GF_SOLARIS_HOST_OS)
+ #include <sys/procfs.h>
+-#else
++#elif !defined(GF_LINUX_HOST_OS)
+ #include <sys/sysctl.h>
+ #endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glusterfs.git/commitdiff/69c02f38cf07749cc890cf4dcf4637ff28e5c188