diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2018-01-25 10:39:19 -0500 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2018-01-26 10:55:26 +0000 |
| commit | 3cad44e8a7a0c481f3d1311b18aa854e4b33a1fb (patch) | |
| tree | 90cceaecf12edf7f2d7e268c9086ac4ada880a54 | |
| parent | ae7d5d26ffe38b3be6b9a9bc1883075491c1c709 (diff) | |
build: use libtirpc by default, even if ipv6 is not the default
Another error snuck in with Change-Id I86f847dfd, or more
accurately I think, with Change-Id: Ic47065e9c2...
All libs, not just libgfrpc, need to be linked with libtirpc,
especially on systems that still have xdr functions in (g)libc
where you will get a mixture of calls to libtirpc functions
and glibc functions, with catastrophic results.
BUG: 1536186
Change-Id: I97dc39c7844f44c36fe210aa813480c219e1e415
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | api/src/Makefile.am | 2 | ||||
| -rw-r--r-- | libglusterfs/src/Makefile.am | 3 | ||||
| -rw-r--r-- | rpc/xdr/src/Makefile.am | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/api/src/Makefile.am b/api/src/Makefile.am index 625183c8dbc..3d25823925b 100644 --- a/api/src/Makefile.am +++ b/api/src/Makefile.am @@ -21,7 +21,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ AM_CFLAGS = -Wall $(GF_CFLAGS) -libgfapi_la_LDFLAGS = -version-info $(GFAPI_LT_VERSION) \ +libgfapi_la_LDFLAGS = -version-info $(GFAPI_LT_VERSION) $(GF_LDFLAGS) \ $(GFAPI_EXTRA_LDFLAGS) $(ACL_LIBS) xlator_LTLIBRARIES = api.la diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index 089261a9183..fc7cb8fd016 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -13,7 +13,8 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ -I$(CONTRIBDIR)/xxhash libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) -libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) -export-symbols $(top_srcdir)/libglusterfs/src/libglusterfs.sym +libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) $(GF_LDFLAGS) \ + -export-symbols $(top_srcdir)/libglusterfs/src/libglusterfs.sym lib_LTLIBRARIES = libglusterfs.la libgfchangelogdir = $(includedir)/glusterfs/gfchangelog diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am index 45816b977d5..495b9999236 100644 --- a/rpc/xdr/src/Makefile.am +++ b/rpc/xdr/src/Makefile.am @@ -16,7 +16,7 @@ libgfxdr_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \ libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -libgfxdr_la_LDFLAGS = -version-info $(LIBGFXDR_LT_VERSION) \ +libgfxdr_la_LDFLAGS = -version-info $(LIBGFXDR_LT_VERSION) $(GF_LDFLAGS) \ -export-symbols $(top_srcdir)/rpc/xdr/src/libgfxdr.sym libgfxdr_la_SOURCES = xdr-generic.c xdr-nfs3.c msg-nfs3.c |