summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2017-02-16 09:58:15 +0100
committerNiels de Vos <ndevos@redhat.com>2017-02-17 04:24:29 -0500
commitb8d827f4e7a289a7d6052e2596064b2f4ceb8d60 (patch)
tree5dbb4f9a66370743ca56939628d48fc5ccf8b037
parentfca31ae5faa15a02e64143b9efb7e19c3b907c2d (diff)
build: fix linking of 'gf_logdump' and 'gf_recon'
When linking the 'gf_recon' and 'gf_logdump' binaries on certain OS's (Debian?), the following error is returned and compilation aborts: Making all in src CCLD gf_recon Makefile:617: recipe for target 'gf_recon' failed Furher inspection showed this failure: /lib/x86_64-linux-gnu/libuuid.so.1: error adding symbols: DSO missing from command line 'gf_recon' and 'gf_logdump' link against libgfapi, and also need to pass the additional used libraries on the 'ld' commandline. Change-Id: I7401023f154dde46443f0186dda8ba749951234c Reported-by: chawlanikhil24 (on IRC) BUG: 1198849 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: https://review.gluster.org/16639 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org>
-rw-r--r--xlators/experimental/fdl/src/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/xlators/experimental/fdl/src/Makefile.am b/xlators/experimental/fdl/src/Makefile.am
index 3f1eccc0ed6..b886b2e2ee3 100644
--- a/xlators/experimental/fdl/src/Makefile.am
+++ b/xlators/experimental/fdl/src/Makefile.am
@@ -10,15 +10,15 @@ fdl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
sbin_PROGRAMS = gf_logdump gf_recon
gf_logdump_SOURCES = logdump.c
nodist_gf_logdump_SOURCES = libfdl.c
-gf_logdump_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\
- $(top_builddir)/api/src/libgfapi.la
+gf_logdump_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ $(top_builddir)/api/src/libgfapi.la $(GFAPI_LIBS) $(UUID_LIBS)
# Eventually recon(ciliation) code will move elsewhere, but for now it's
# easier to have it next to the similar logdump code.
gf_recon_SOURCES = recon.c
nodist_gf_recon_SOURCES = librecon.c
-gf_recon_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\
- $(top_builddir)/api/src/libgfapi.la
+gf_recon_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ $(top_builddir)/api/src/libgfapi.la $(GFAPI_LIBS) $(UUID_LIBS)
AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
-I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \