From c17d13493785eb1de9bbc4545f461e44aafa72c6 Mon Sep 17 00:00:00 2001 From: "Roald J. van Loon" Date: Sat, 7 Sep 2013 19:25:17 +0200 Subject: [PATCH] fix: build tests need libcrc.la Build tests are failing because the need crc32c.cc's functions, so we need to link them against libcrc.la Signed-off-by: Roald J. van Loon --- src/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d93e63c4c4e..236ea51e375 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -299,23 +299,23 @@ bin_DEBUGPROGRAMS += ceph_multi_stress_watch if WITH_BUILD_TESTS ceph_test_libcommon_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) -ceph_test_libcommon_build_LDADD = $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_libcommon_build_LDADD = libcrc.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) bin_DEBUGPROGRAMS += ceph_test_libcommon_build ceph_test_librados_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) $(librados_SOURCES) -ceph_test_librados_build_LDADD = $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_librados_build_LDADD = libcrc.la $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) ceph_test_librados_build_CXXFLAGS = $(AM_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_librados_build ceph_test_librgw_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) \ $(librados_SOURCES) $(librgw_la_SOURCES) -ceph_test_librgw_build_LDADD = -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_librgw_build_LDADD = libcrc.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) ceph_test_librgw_build_CXXFLAGS = $(AM_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_librgw_build ceph_test_libcephfs_build_SOURCES = test/test_libcommon_build.cc $(libcommon_files) \ $(libosdc_la_SOURCES) -ceph_test_libcephfs_build_LDADD = libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_libcephfs_build_LDADD = libcrc.la libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) ceph_test_libcephfs_build_CXXFLAGS = $(AM_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_libcephfs_build endif @@ -324,7 +324,7 @@ if WITH_HADOOPCLIENT ceph_test_libhadoopcephfs_build_SOURCES = test/test_libcommon_build.cc \ $(libhadoopcephfs_la_SOURCES) \ $(libosdc_la_SOURCES) $(libcommon_files) -ceph_test_libhadoopcephfs_build_LDADD = libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) +ceph_test_libhadoopcephfs_build_LDADD = libcrc.la libcephfs.la -lexpat $(PTHREAD_LIBS) -lm $(CRYPTO_LIBS) $(EXTRALIBS) ceph_test_libhadoopcephfs_build_CXXFLAGS = $(AM_CXXFLAGS) bin_DEBUGPROGRAMS += ceph_test_libhadoopcephfs_build endif -- 2.47.3