From bad11933754fbb2a8b698a0e899b77d354816549 Mon Sep 17 00:00:00 2001 From: chunmei Date: Wed, 4 Oct 2017 11:25:15 -0700 Subject: [PATCH] fix dpdk build error. when ./do_cmake.sh add -DWITH_DPDK=ON -DUSE_CRYPTOPP=ON -DWITH_NSS=OFF -DWITH_TESTS=OFF if build debian package, need remove some file froms install since we disabled TESTS. Signed-off-by: chunmei --- src/CMakeLists.txt | 3 +++ src/msg/async/dpdk/DPDKStack.cc | 1 + src/msg/async/dpdk/TCP.h | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e48afcff51d0..15021fab9aff 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -654,6 +654,9 @@ set(ceph_common_deps if(HAVE_RDMA) list(APPEND ceph_common_deps ${RDMA_LIBRARY}) endif() +if(HAVE_DPDK) + list(APPEND ceph_common_deps ${DPDK_LIBRARIES}) +endif() if(NOT WITH_SYSTEM_BOOST) list(APPEND ceph_common_deps ${ZLIB_LIBRARIES}) endif() diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc index e828789a51db..fce05098007f 100644 --- a/src/msg/async/dpdk/DPDKStack.cc +++ b/src/msg/async/dpdk/DPDKStack.cc @@ -48,6 +48,7 @@ #include "common/dout.h" #include "include/assert.h" +#include "common/Cond.h" #define dout_subsys ceph_subsys_dpdk #undef dout_prefix diff --git a/src/msg/async/dpdk/TCP.h b/src/msg/async/dpdk/TCP.h index a601130c335d..3eab5a5b9b92 100644 --- a/src/msg/async/dpdk/TCP.h +++ b/src/msg/async/dpdk/TCP.h @@ -383,7 +383,7 @@ class tcp { uint32_t key[16]; isn_secret () { for (auto& k : key) { - k = ceph::util::generate_random_number(); + k = ceph::util::generate_random_number(0, std::numeric_limits::max()); } } }; -- 2.47.3