From f47213cbd7e97ccb7253589ffece19dd6d6dc1f0 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sat, 3 Dec 2016 13:29:56 +0100 Subject: [PATCH] build/ops: fix undefined crypto references with --with-xio Only with --with-xio, RPM build fails due to undefined references to various symbols starting with "PK11_" in ./.libs/libcommon.a(Crypto.o) in several of the unit tests. Fixes: http://tracker.ceph.com/issues/18133 Signed-off-by: Nathan Cutler --- src/test/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/test/Makefile.am b/src/test/Makefile.am index ce6fc2048f7bf..480b7df2cb771 100644 --- a/src/test/Makefile.am +++ b/src/test/Makefile.am @@ -289,7 +289,7 @@ unittest_str_list_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) check_TESTPROGRAMS += unittest_str_list unittest_log_SOURCES = log/test.cc -unittest_log_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) +unittest_log_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_log_CXXFLAGS = $(UNITTEST_CXXFLAGS) -O2 check_TESTPROGRAMS += unittest_log @@ -344,7 +344,7 @@ unittest_bufferlist_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_TESTPROGRAMS += unittest_bufferlist unittest_xlist_SOURCES = test/test_xlist.cc -unittest_xlist_LDADD = $(UNITTEST_LDADD) $(LIBCOMMON) +unittest_xlist_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_xlist_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_TESTPROGRAMS += unittest_xlist @@ -424,7 +424,7 @@ unittest_safe_io_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_TESTPROGRAMS += unittest_safe_io unittest_heartbeatmap_SOURCES = test/heartbeat_map.cc -unittest_heartbeatmap_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) $(CEPH_GLOBAL) +unittest_heartbeatmap_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_heartbeatmap_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_TESTPROGRAMS += unittest_heartbeatmap @@ -447,7 +447,7 @@ unittest_ipaddr_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_TESTPROGRAMS += unittest_ipaddr unittest_texttable_SOURCES = test/test_texttable.cc -unittest_texttable_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) +unittest_texttable_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_texttable_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_TESTPROGRAMS += unittest_texttable @@ -476,7 +476,7 @@ unittest_interval_set_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) check_TESTPROGRAMS += unittest_interval_set unittest_subprocess_SOURCES = test/test_subprocess.cc -unittest_subprocess_LDADD = $(LIBCOMMON) $(UNITTEST_LDADD) +unittest_subprocess_LDADD = $(UNITTEST_LDADD) $(CEPH_GLOBAL) unittest_subprocess_CXXFLAGS = $(UNITTEST_CXXFLAGS) check_PROGRAMS += unittest_subprocess -- 2.39.5