From 8098e549643cd98f527ee923d6e3ab804cfe5b65 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 13 Jun 2018 21:35:24 +0800 Subject: [PATCH 1/2] spdk: update to latest spdk-18.05 branch also bump dpdk to to spdk-18.05 branch. this should fix the build failure on Fedora 28 Signed-off-by: Kefu Chai --- src/spdk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spdk b/src/spdk index dc82989dd27..7d45ab345d7 160000 --- a/src/spdk +++ b/src/spdk @@ -1 +1 @@ -Subproject commit dc82989dd2747db0384cafb3b310f2e8792d5c24 +Subproject commit 7d45ab345d7293c6679bedd89d5dc16310026ba9 From c2026b7473173e021c1f5ee072828538ea5c5d61 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 14 Jun 2018 09:32:08 +0800 Subject: [PATCH 2/2] cmake: update BuildSPDK for spdk-18.05 in spdk v18.05, libuuid is linked by libspdk_util.a, in which, it is used by lib/util/uuid.c. and libspdk_vol.a uses the wrapper function exposed by libspdk_util.a, so update the CMakefile script to reflect the change. Signed-off-by: Kefu Chai --- cmake/modules/BuildSPDK.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/modules/BuildSPDK.cmake b/cmake/modules/BuildSPDK.cmake index 348071228f0..43adff82d24 100644 --- a/cmake/modules/BuildSPDK.cmake +++ b/cmake/modules/BuildSPDK.cmake @@ -30,10 +30,10 @@ macro(build_spdk) endforeach() set_target_properties(spdk::env_dpdk PROPERTIES INTERFACE_LINK_LIBRARIES "${DPDK_LIBRARIES};rt") - if(LINUX) - set_target_properties(spdk::lvol PROPERTIES - INTERFACE_LINK_LIBRARIES ${UUID_LIBRARIES}) - endif() + set_target_properties(spdk::lvol PROPERTIES + INTERFACE_LINK_LIBRARIES spdk::util) + set_target_properties(spdk::util PROPERTIES + INTERFACE_LINK_LIBRARIES ${UUID_LIBRARIES}) set(SPDK_INCLUDE_DIR "${source_dir}/include") unset(source_dir) endmacro()