configure.ac: fix spdk external header location

Signed-off-by: Haomai Wang <haomai@xsky.com>

diff --git a/configure.ac b/configure.ac
index 9175d052aaaa4bbd48bb914065970f794fdd87b7..b0526708fc8b51afc3eb91e547ae3c89f00addef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -724,12 +724,13 @@ fi
 #
 # SPDK
 #
-AC_ARG_ENABLE(spdk,
+AC_ARG_WITH(spdk,
     [AC_HELP_STRING([--with-spdk], [build Ceph SPDK Support])], [], [with_spdk=no])
 
-AM_CONDITIONAL(HAVE_SPDK, [test "x$with_spdk" = "xyes"])
+AM_CONDITIONAL(HAVE_SPDK, [test "x$with_spdk" != "xno"])
 
-if test "x$with_spdk" = x"yes"; then
+if test "x$with_spdk" != x"no"; then
+   CPPFLAGS="$CPPFLAGS -I$with_spdk/include"
    AC_CHECK_HEADER([spdk/nvme.h], [], AC_MSG_ERROR([Cannot find header 'spdk/nvme.h'.]))
    AC_CHECK_LIB([spdk_nvme], [nvme_attach], [], AC_MSG_FAILURE([SPDK nvme_attach not found]))
 

diff --git a/src/os/Makefile.am b/src/os/Makefile.am
index ac11b8bd25aebdc2b857e3abf9e0164f63f5c73f..25f33964f7f5f6201abd206d8e28df5965c77117 100644 (file)
--- a/src/os/Makefile.am
+++ b/src/os/Makefile.am
@@ -121,6 +121,8 @@ noinst_HEADERS += os/fs/ZFS.h
 endif
 
 if HAVE_SPDK
+libos_a_CXXFLAGS = ${AM_CXXFLAGS} -I ${with_spdk}/include -fPIC
+libos_a_LIBADD += "-lspdk_nvme -lpciaccess -lpthread -lrte_eal -lrte_mempool -lrte_ring"
 libos_a_SOURCES += os/bluestore/NVMEDevice.cc
 noinst_HEADERS += os/bluestore/NVMEDevice.h
 endif

diff --git a/src/os/bluestore/BlockDevice.cc b/src/os/bluestore/BlockDevice.cc
index 528d71114ded92b9f2bfa1ed7cef119abede54f7..abe1dfffd44cbdf8a1c5978bf5db1ad8557a8d13 100644 (file)
--- a/src/os/bluestore/BlockDevice.cc
+++ b/src/os/bluestore/BlockDevice.cc
@@ -14,7 +14,7 @@
  *
  */
 
-#include "BlockDevice.h"
+#include "KernelDevice.h"
 #if defined(HAVE_SPDK)
 #include "NVMEDevice.h"
 #endif

diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h
index b257f9348b2b2d1b497b43471db6d84b35a2e7ab..bc0534b3de7eccd6bb174b60a5816c7abcc84c6e 100644 (file)
--- a/src/os/bluestore/NVMEDevice.h
+++ b/src/os/bluestore/NVMEDevice.h
@@ -17,6 +17,10 @@
 #ifndef CEPH_OS_BLUESTORE_NVMEDEVICE
 #define CEPH_OS_BLUESTORE_NVMEDEVICE
 
+#include <pciaccess.h>
+
+#include "spdk/nvme.h"
+
 #include "BlockDevice.h"
 
 class NVMEDevice : public BlockDevice {