From ed15489d39b4c08df20f64dd6e087b0f000ab327fe52d69d91d3b100beeb6aca Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 14 Nov 2017 15:36:38 +0000 Subject: [PATCH] Accepting request 541852 from home:kukuk:tirpc - glusterfs-tirpc.diff: fallback to libtirpc if there is no sunrpc support in glibc OBS-URL: https://build.opensuse.org/request/show/541852 OBS-URL: https://build.opensuse.org/package/show/filesystems/glusterfs?expand=0&rev=47 --- glusterfs-tirpc.diff | 24 ++++++++++++++++++++++++ glusterfs.changes | 6 ++++++ glusterfs.spec | 4 ++++ 3 files changed, 34 insertions(+) create mode 100644 glusterfs-tirpc.diff diff --git a/glusterfs-tirpc.diff b/glusterfs-tirpc.diff new file mode 100644 index 0000000..c1ec189 --- /dev/null +++ b/glusterfs-tirpc.diff @@ -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 ++old_CFLAGS=$CFLAGS ++AC_CACHE_CHECK([where to find ], [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 ++ ]])], [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) diff --git a/glusterfs.changes b/glusterfs.changes index de1c5d5..ad234dd 100644 --- a/glusterfs.changes +++ b/glusterfs.changes @@ -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 diff --git a/glusterfs.spec b/glusterfs.spec index 470fdb8..51202fb 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -26,6 +26,7 @@ Url: http://www.gluster.org/ #Git-Clone: git://github.com/gluster/glusterfs #Git-Clone: git://github.com/fvzwieten/lsgvt Source: http://download.gluster.org/pub/gluster/glusterfs/3.8/%version/%name-%version.tar.gz +Patch: glusterfs-tirpc.diff Patch1: glusterfs-date.diff BuildRequires: acl-devel BuildRequires: autoconf @@ -38,9 +39,11 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python2 BuildRequires: readline-devel +BuildRequires: rpcgen BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(fuse) >= 2.6.5 BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libtirpc) BuildRequires: pkgconfig(liburcu) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(python) @@ -147,6 +150,7 @@ links. %prep %setup -q +%patch -p0 %patch1 -p1 %build