From: Noah Watkins <noahwatkins@gmail.com>
Date: Sat, 21 Dec 2013 19:03:05 +0000 (-0600)
Subject: make: add libcommon for missing symbols
X-Git-Tag: v0.75~51^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79c5a2e8c8976070768d460e1374894c60d6d133;p=ceph.git

make: add libcommon for missing symbols

On OSX without linking in libcommon at the end of these make targets
there is a missing reference to pipe_cloexec, even though the dependency
is present indirectly through libglobal.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 8b01e0505315..24f8fa93cf46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,18 +35,18 @@ include tools/Makefile.am
 # core daemons
 
 ceph_mon_SOURCES = ceph_mon.cc
-ceph_mon_LDADD = $(LIBMON) $(LIBOS) $(CEPH_GLOBAL)
+ceph_mon_LDADD = $(LIBMON) $(LIBOS) $(CEPH_GLOBAL) $(LIBCOMMON)
 bin_PROGRAMS += ceph-mon
 
 ceph_osd_SOURCES = ceph_osd.cc
-ceph_osd_LDADD = $(LIBOSD) $(CEPH_GLOBAL)
+ceph_osd_LDADD = $(LIBOSD) $(CEPH_GLOBAL) $(LIBCOMMON)
 if LINUX
 ceph_osd_LDADD += -ldl
 endif # LINUX
 bin_PROGRAMS += ceph-osd
 
 ceph_mds_SOURCES = ceph_mds.cc
-ceph_mds_LDADD = $(LIBMDS) $(LIBOSDC) $(CEPH_GLOBAL)
+ceph_mds_LDADD = $(LIBMDS) $(LIBOSDC) $(CEPH_GLOBAL) $(LIBCOMMON)
 bin_PROGRAMS += ceph-mds
 
 
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 901f172ec2c1..0a386cc38838 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -27,7 +27,7 @@ endif # LINUX
 bin_PROGRAMS += ceph_filestore_dump
 
 monmaptool_SOURCES = tools/monmaptool.cc
-monmaptool_LDADD = $(CEPH_GLOBAL)
+monmaptool_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON)
 bin_PROGRAMS += monmaptool
 
 crushtool_SOURCES = tools/crushtool.cc
@@ -83,11 +83,11 @@ endif # WITH_SYSTEM_LIBS3
 endif # WITH_REST_BENCH
 
 ceph_conf_SOURCES = tools/ceph_conf.cc
-ceph_conf_LDADD = $(CEPH_GLOBAL)
+ceph_conf_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON)
 bin_PROGRAMS += ceph-conf
 
 ceph_authtool_SOURCES = tools/ceph_authtool.cc
-ceph_authtool_LDADD = $(CEPH_GLOBAL)
+ceph_authtool_LDADD = $(CEPH_GLOBAL) $(LIBCOMMON)
 bin_PROGRAMS += ceph-authtool
 
 ceph_mon_store_converter_SOURCES = tools/mon_store_converter.cc