|
 |
e7a346 |
From bacce074e2022ba75216571e4866c54c464b6e51 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
|
|
|
e7a346 |
Date: Fri, 8 Mar 2019 18:58:25 +0530
|
|
|
e7a346 |
Subject: [PATCH 512/512] build: use libtirpc by default, even if ipv6 is not
|
|
|
e7a346 |
the default
|
|
|
e7a346 |
|
|
|
e7a346 |
Another error snuck in with Change-Id I86f847dfd, or more
|
|
|
e7a346 |
accurately I think, with Change-Id: Ic47065e9c2...
|
|
|
e7a346 |
|
|
|
e7a346 |
All libs, not just libgfrpc, need to be linked with libtirpc,
|
|
|
e7a346 |
especially on systems that still have xdr functions in (g)libc
|
|
|
e7a346 |
where you will get a mixture of calls to libtirpc functions
|
|
|
e7a346 |
and glibc functions, with catastrophic results.
|
|
|
e7a346 |
|
|
|
e7a346 |
Label: DOWNSTREAM ONLY
|
|
|
e7a346 |
|
|
|
e7a346 |
BUG: 1536186
|
|
|
e7a346 |
Change-Id: I97dc39c7844f44c36fe210aa813480c219e1e415
|
|
|
e7a346 |
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
api/src/Makefile.am | 2 +-
|
|
|
e7a346 |
libglusterfs/src/Makefile.am | 2 +-
|
|
|
e7a346 |
rpc/xdr/src/Makefile.am | 2 +-
|
|
|
e7a346 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/api/src/Makefile.am b/api/src/Makefile.am
|
|
|
e7a346 |
index 625183c8d..3d2582392 100644
|
|
|
e7a346 |
--- a/api/src/Makefile.am
|
|
|
e7a346 |
+++ b/api/src/Makefile.am
|
|
|
e7a346 |
@@ -21,7 +21,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
|
|
|
e7a346 |
|
|
|
e7a346 |
AM_CFLAGS = -Wall $(GF_CFLAGS)
|
|
|
e7a346 |
|
|
|
e7a346 |
-libgfapi_la_LDFLAGS = -version-info $(GFAPI_LT_VERSION) \
|
|
|
e7a346 |
+libgfapi_la_LDFLAGS = -version-info $(GFAPI_LT_VERSION) $(GF_LDFLAGS) \
|
|
|
e7a346 |
$(GFAPI_EXTRA_LDFLAGS) $(ACL_LIBS)
|
|
|
e7a346 |
|
|
|
e7a346 |
xlator_LTLIBRARIES = api.la
|
|
|
e7a346 |
diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am
|
|
|
e7a346 |
index 6c81142b8..44de790c5 100644
|
|
|
e7a346 |
--- a/libglusterfs/src/Makefile.am
|
|
|
e7a346 |
+++ b/libglusterfs/src/Makefile.am
|
|
|
e7a346 |
@@ -13,7 +13,7 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \
|
|
|
e7a346 |
-I$(CONTRIBDIR)/xxhash
|
|
|
e7a346 |
|
|
|
e7a346 |
libglusterfs_la_LIBADD = @LEXLIB@ $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS)
|
|
|
e7a346 |
-libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION)
|
|
|
e7a346 |
+libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) $(GF_LDFLAGS)
|
|
|
e7a346 |
|
|
|
e7a346 |
lib_LTLIBRARIES = libglusterfs.la
|
|
|
e7a346 |
libgfchangelogdir = $(includedir)/glusterfs/gfchangelog
|
|
|
e7a346 |
diff --git a/rpc/xdr/src/Makefile.am b/rpc/xdr/src/Makefile.am
|
|
|
e7a346 |
index 77f545646..e0b013751 100644
|
|
|
e7a346 |
--- a/rpc/xdr/src/Makefile.am
|
|
|
e7a346 |
+++ b/rpc/xdr/src/Makefile.am
|
|
|
e7a346 |
@@ -16,7 +16,7 @@ libgfxdr_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE_OFFSET64 \
|
|
|
e7a346 |
|
|
|
e7a346 |
libgfxdr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
|
|
|
e7a346 |
|
|
|
e7a346 |
-libgfxdr_la_LDFLAGS = -version-info $(LIBGFXDR_LT_VERSION)
|
|
|
e7a346 |
+libgfxdr_la_LDFLAGS = -version-info $(LIBGFXDR_LT_VERSION) $(GF_LDFLAGS)
|
|
|
e7a346 |
|
|
|
e7a346 |
libgfxdr_la_SOURCES = xdr-generic.c xdr-nfs3.c msg-nfs3.c
|
|
|
e7a346 |
nodist_libgfxdr_la_SOURCES = $(XDRSOURCES)
|
|
|
e7a346 |
--
|
|
|
e7a346 |
2.20.1
|
|
|
e7a346 |
|