dirkmueller/glusterfs
SHA256
1
0
Fork 0
forked from pool/glusterfs
Code Pull Requests Activity

Accepting request 541860 from filesystems

Browse Source 
- glusterfs-tirpc.diff: fallback to libtirpc if there is no sunrpc
  support in glibc (forwarded request 541852 from kukuk)

OBS-URL: https://build.opensuse.org/request/show/541860
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glusterfs?expand=0&rev=19
This commit is contained in:
Dominique Leuenberger 2017-11-16 12:59:19 +00:00 committed by Git OBS Bridge
commit c28ce316b4
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
glusterfs-tirpc.diff Normal file
View File

@ -0,0 +1,24 @@
--- configure.ac
+++ configure.ac 2017/11/13 06:44:32
@@ -399,6 +399,21 @@
AC_CHECK_HEADERS([openssl/ecdh.h])
+dnl RPC library
+AC_CHECK_FUNC([xdrmem_create],[], AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl tirpc]))
+dnl Cygwin/recent glibc requires -I/usr/include/tirpc for <rpc/rpc.h>
+old_CFLAGS=$CFLAGS
+AC_CACHE_CHECK([where to find <rpc/rpc.h>], [lv_cv_xdr_cflags], [
+ for add_CFLAGS in '' '-I/usr/include/tirpc' 'missing'; do
+ if test x"$add_CFLAGS" = xmissing; then
+ lv_cv_xdr_cflags=missing; break
+ fi
+ CFLAGS="$old_CFLAGS $add_CFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <rpc/rpc.h>
+ ]])], [lv_cv_xdr_cflags=${add_CFLAGS:-none}; break])
+ done
+])
+
dnl Math library
AC_CHECK_LIB([m], [pow], [MATH_LIB='-lm'], [MATH_LIB=''])
AC_SUBST(MATH_LIB)

6
glusterfs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 13 07:49:33 CET 2017 - kukuk@suse.de
- glusterfs-tirpc.diff: fallback to libtirpc if there is no sunrpc
support in glibc
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 3 10:10:48 UTC 2017 - mpluskal@suse.com Fri Nov 3 10:10:48 UTC 2017 - mpluskal@suse.com

4
glusterfs.spec
View File

@ -26,6 +26,7 @@ Url: http://www.gluster.org/
#Git-Clone: git://github.com/gluster/glusterfs #Git-Clone: git://github.com/gluster/glusterfs
#Git-Clone: git://github.com/fvzwieten/lsgvt #Git-Clone: git://github.com/fvzwieten/lsgvt
Source: http://download.gluster.org/pub/gluster/glusterfs/3.8/%version/%name-%version.tar.gz Source: http://download.gluster.org/pub/gluster/glusterfs/3.8/%version/%name-%version.tar.gz
Patch: glusterfs-tirpc.diff
Patch1: glusterfs-date.diff Patch1: glusterfs-date.diff
BuildRequires: acl-devel BuildRequires: acl-devel
BuildRequires: autoconf BuildRequires: autoconf
@ -38,9 +39,11 @@ BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: python2 BuildRequires: python2
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: rpcgen
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(fuse) >= 2.6.5 BuildRequires: pkgconfig(fuse) >= 2.6.5
BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(libtirpc)
BuildRequires: pkgconfig(liburcu) BuildRequires: pkgconfig(liburcu)
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(python)
@ -147,6 +150,7 @@ links.
%prep %prep
%setup -q %setup -q
%patch -p0
%patch1 -p1 %patch1 -p1
%build %build