summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorAnoop C S <anoopcs@redhat.com>2018-01-08 17:32:05 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2018-01-11 12:41:54 +0000
commit0e4fdfbc4fec55cdc3eb6e0e27408682afe22696 (patch)
tree3545e7b449e959cb57ead69a9162a1b7488cad89 /rpc
parenta601db69c771ab0d541815d2dd46183892e554c9 (diff)
build: Link libgfrpc within rpc-transport shared libraries
Now with https://review.gluster.org/#/c/19056/ merged, we perform dlopen() with RTLD_LOCAL so that every shared library is expected to be explicitly linked against other required libraries. "undefined symbol ..." was seen while trying to access GlusterFS volumes via NFS-Ganesha/Samba using libgfapi resulting in an unusable state. This is a follow-up patch to https://review.gluster.org/#/c/17659/ to make sure that we link libgfrpc too while making socket and rdma rpc-transport shared libraries. Change-Id: I9943cdc449c257ded3cb9f9f2becdd5784d1d82d BUG: 1532238 Signed-off-by: Anoop C S <anoopcs@redhat.com>
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-transport/rdma/src/Makefile.am6
-rw-r--r--rpc/rpc-transport/socket/src/Makefile.am1
2 files changed, 5 insertions, 2 deletions
diff --git a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am
index fedf304c5fe..40b5a19d3d1 100644
--- a/rpc/rpc-transport/rdma/src/Makefile.am
+++ b/rpc/rpc-transport/rdma/src/Makefile.am
@@ -6,8 +6,10 @@ transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
rdma_la_LDFLAGS = -module -avoid-version -nostartfiles
rdma_la_SOURCES = rdma.c name.c
-rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
- -libverbs -lrdmacm
+rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ $(top_builddir)/rpc/xdr/src/libgfxdr.la \
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
+ -libverbs -lrdmacm
noinst_HEADERS = rdma.h name.h rpc-trans-rdma-messages.h
diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am
index a1c9a6120f1..7b488583771 100644
--- a/rpc/rpc-transport/socket/src/Makefile.am
+++ b/rpc/rpc-transport/socket/src/Makefile.am
@@ -8,6 +8,7 @@ socket_la_LDFLAGS = -module -avoid-version
socket_la_SOURCES = socket.c name.c
socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
$(top_builddir)/rpc/xdr/src/libgfxdr.la \
+ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-lssl
AM_CPPFLAGS = $(GF_CPPFLAGS) \