From c4c646ca5b942aeb30fdba79cf661b37771ad7ad Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Tue, 31 Mar 2015 10:46:10 -0700 Subject: [PATCH] make: fix with_rbd guard FileJournal needs stuff from blkdev.c in libcommon. ./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::_open_block_device()': /home/nwatkins/src/ceph/src/os/FileJournal.cc:139: undefined reference to `get_block_device_size(int, long*)' /home/nwatkins/src/ceph/src/os/FileJournal.cc:161: undefined reference to `block_device_support_discard(char const*)' ./.libs/libosd.a(libos_la-FileJournal.o): In function `FileJournal::do_discard(long, long)': /home/nwatkins/src/ceph/src/os/FileJournal.cc:1587: undefined reference to `block_device_discard(int, long, long)' Signed-off-by: Noah Watkins --- src/common/Makefile.am | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 60d4e2051c0ad..2778b58e3aaee 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -75,10 +75,8 @@ libcommon_internal_la_SOURCES = \ common/Cycles.cc \ common/ContextCompletion.cc -if WITH_RBD libcommon_internal_la_SOURCES += \ common/blkdev.cc -endif if ENABLE_XIO libcommon_internal_la_SOURCES += \ -- 2.47.3