[patch] glusterfs-3.12.3-libtirpc.patch

glusterfs-3.12.3-libtirpc.patch (text/plain), 4.47 KB, created by James Le Cuirot on 2017-12-09 13:34:04 UTC

From 5691b5ffeac2482481a214a61559f74293deeb41 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <[e-mail]>
Date: Tue, 5 Dec 2017 23:34:35 +0000
Subject: [PATCH] build: Allow libtirpc to be explicitly requested

Some distributions like Gentoo no longer include the RPC stuff in
their glibc packages.

Change-Id: Ic7e34d82196aebdbca3d5b3b0ec3dd8b655e3355
Signed-off-by: James Le Cuirot <[e-mail]>
---
 configure.ac                           | 12 ++++++++++++
 libglusterfs/src/compat.h              |  4 ++++
 rpc/rpc-lib/src/rpc-transport.c        |  4 ++++
 xlators/nfs/server/src/mount3.c        |  4 ++--
 xlators/nfs/server/src/mount3udp_svc.c |  2 +-
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce689225c..2384375ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,6 +291,10 @@ else
         CFLAGS="${CFLAGS} -g -rdynamic"
 fi
 
+AC_ARG_WITH([libtirpc],
+        AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
+        [], [with_libtirpc=no])
+
 AC_ARG_ENABLE([privport_tracking],
               AC_HELP_STRING([--disable-privport_tracking],
                              [Disable internal tracking of privileged ports.]))
@@ -1050,6 +1054,14 @@ AC_SUBST(GF_DISTRIBUTION)
 GF_HOST_OS=""
 GF_LDFLAGS="-rdynamic"
 
+if test "x$with_libtirpc" = "xyes" ; then
+    PKG_CHECK_MODULES([TIRPC], [libtirpc],
+       [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
+       [AC_MSG_ERROR([libtirpc requested but library not found])]
+    )
+    AC_DEFINE(HAVE_LIBTIRPC, 1, [Define if libtirpc is enabled.])
+fi
+
 dnl check for gcc -Werror=format-security
 saved_CFLAGS=$CFLAGS
 CFLAGS="-Wformat -Werror=format-security"
diff --git a/libglusterfs/src/compat.h b/libglusterfs/src/compat.h
index f4da4b2a0..9959982a0 100644
--- a/libglusterfs/src/compat.h
+++ b/libglusterfs/src/compat.h
@@ -487,6 +487,8 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
 #define ST_CTIM_NSEC_SET(stbuf, val) do { } while (0);
 #endif
 
+#ifndef HAVE_LIBTIRPC
+
 #ifndef IXDR_GET_LONG
 #define IXDR_GET_LONG(buf) ((long)IXDR_GET_U_INT32(buf))
 #endif
@@ -503,6 +505,8 @@ int gf_mkostemp (char *tmpl, int suffixlen, int flags);
 #define IXDR_PUT_U_LONG(buf, v)       IXDR_PUT_LONG(buf, (long)(v))
 #endif
 
+#endif /* HAVE_LIBTIRPC */
+
 #if defined(__GNUC__) && !defined(RELAX_POISONING)
 /* Use run API, see run.h */
 #include <stdlib.h> /* system(), mkostemp() */
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index fc26f462c..8334d7bef 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -656,7 +656,11 @@ rpc_transport_inet_options_build (dict_t **options, const char *hostname,
         dict_t          *dict = NULL;
         char            *host = NULL;
         int             ret = -1;
+#ifdef HAVE_LIBTIRPC
+        char            *addr_family = "inet6";
+#else
         char            *addr_family = "inet";
+#endif
 
         GF_ASSERT (options);
         GF_ASSERT (hostname);
diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index 64f109484..96734ff64 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -1744,7 +1744,7 @@ mnt3_check_client_net_udp (struct svc_req *req, char *volname, xlator_t *nfsx)
         if ((!req) || (!volname) || (!nfsx))
                 goto err;
 
-#if !defined(_TIRPC_SVC_H)
+#if !defined(HAVE_LIBTIRPC)
         sin = svc_getcaller (req->rq_xprt);
 #else
         sin = (struct sockaddr_in *)svc_getcaller (req->rq_xprt);
@@ -2846,7 +2846,7 @@ __mnt3udp_get_export_subdir_inode (struct svc_req *req, char *subdir,
         if (exp->hostspec) {
                 struct sockaddr_in *sin = NULL;
 
-#if !defined(_TIRPC_SVC_H)
+#if !defined(HAVE_LIBTIRPC)
                 sin = svc_getcaller (req->rq_xprt);
 #else
                 sin = (struct sockaddr_in *)svc_getcaller (req->rq_xprt);
diff --git a/xlators/nfs/server/src/mount3udp_svc.c b/xlators/nfs/server/src/mount3udp_svc.c
index 8256a5970..ce58b4d7c 100644
--- a/xlators/nfs/server/src/mount3udp_svc.c
+++ b/xlators/nfs/server/src/mount3udp_svc.c
@@ -133,7 +133,7 @@ mountudp_program_3(struct svc_req *rqstp, register SVCXPRT *transp)
         mountres3               *res = NULL;
         struct sockaddr_in      *sin = NULL;
 
-#if !defined(_TIRPC_SVC_H)
+#if !defined(HAVE_LIBTIRPC)
         sin = svc_getcaller (transp);
 #else
         sin = (struct sockaddr_in *)svc_getcaller (transp);
-- 
2.15.0