diff options
| author | Anoop C S <anoopcs@redhat.com> | 2018-01-08 17:32:05 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2018-01-11 12:41:54 +0000 |
| commit | 0e4fdfbc4fec55cdc3eb6e0e27408682afe22696 (patch) | |
| tree | 3545e7b449e959cb57ead69a9162a1b7488cad89 | |
| parent | a601db69c771ab0d541815d2dd46183892e554c9 (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>
| -rw-r--r-- | rpc/rpc-transport/rdma/src/Makefile.am | 6 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/Makefile.am | 1 | ||||
| -rw-r--r-- | xlators/features/quota/src/Makefile.am | 6 |
3 files changed, 9 insertions, 4 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) \ diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am index 6c1372b4421..0a9541d0e04 100644 --- a/xlators/features/quota/src/Makefile.am +++ b/xlators/features/quota/src/Makefile.am @@ -6,11 +6,13 @@ quotad_la_LDFLAGS = -module -avoid-version -export-symbols $(top_srcdir)/xlators quota_la_SOURCES = quota.c quota-enforcer-client.c quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/xdr/src/libgfxdr.la + $(top_builddir)/rpc/xdr/src/libgfxdr.la \ + $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la quotad_la_SOURCES = quotad.c quotad-helpers.c quotad-aggregator.c quotad_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/xdr/src/libgfxdr.la + $(top_builddir)/rpc/xdr/src/libgfxdr.la \ + $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la noinst_HEADERS = quota-mem-types.h quota.h quotad-aggregator.h \ quotad-helpers.h quota-messages.h |