From ab84158fc09bf841a0cd0f5be648a15d85ae94eb Mon Sep 17 00:00:00 2001
From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Wed, 6 Nov 2019 17:27:39 +0800
Subject: [PATCH] crimson: link required dpdk components for seastar

see https://github.com/scylladb/seastar/blob/
809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---
 cmake/modules/BuildDPDK.cmake | 43 ++++++++++++++++++++++++++---------
 cmake/modules/Finddpdk.cmake  | 14 +++++++++++-
 2 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/cmake/modules/BuildDPDK.cmake b/cmake/modules/BuildDPDK.cmake
index cfcfc20ae1e..fbe42b62e0d 100644
--- a/cmake/modules/BuildDPDK.cmake
+++ b/cmake/modules/BuildDPDK.cmake
@@ -108,17 +108,38 @@ function(do_export_dpdk dpdk_dir)
     endif()
   endif()
 
-  foreach(c
-      bus_pci
-      cmdline
-      eal
-      ethdev
-      kvargs
-      mbuf
-      mempool
-      mempool_ring
-      pci
-      ring)
+  list(APPEND dpdk_components
+    bus_pci
+    cmdline
+    eal
+    ethdev
+    kvargs
+    mbuf
+    mempool
+    mempool_ring
+    pci
+    ring)
+  if(Seastar_DPDK)
+    list(APPEND dpdk_components
+      bus_vdev
+      cfgfile
+      hash
+      net
+      pmd_bnxt
+      pmd_cxgbe
+      pmd_e1000
+      pmd_ena
+      pmd_enic
+      pmd_i40e
+      pmd_ixgbe
+      pmd_nfp
+      pmd_qede
+      pmd_ring
+      pmd_sfc_efx
+      timer)
+  endif()
+
+  foreach(c ${dpdk_components})
     add_library(dpdk::${c} STATIC IMPORTED)
     add_dependencies(dpdk::${c} dpdk-ext)
     set(dpdk_${c}_LIBRARY
diff --git a/cmake/modules/Finddpdk.cmake b/cmake/modules/Finddpdk.cmake
index 751e1c4594d..f7b7a2d4b2f 100644
--- a/cmake/modules/Finddpdk.cmake
+++ b/cmake/modules/Finddpdk.cmake
@@ -38,6 +38,8 @@ endif()
 
 set(components
   bus_pci
+  bus_vdev
+  cfgfile
   cmdline
   eal
   ethdev
@@ -47,15 +49,25 @@ set(components
   mempool
   mempool_ring
   mempool_stack
+  net
   pci
   pmd_af_packet
+  pmd_bnxt
   pmd_bond
+  pmd_cxgbe
+  pmd_e1000
+  pmd_ena
+  pmd_enic
   pmd_i40e
   pmd_ixgbe
   pmd_mlx5
+  pmd_nfp
+  pmd_qede
   pmd_ring
+  pmd_sfc_efx
   pmd_vmxnet3_uio
-  ring)
+  ring
+  timer)
 
 # for collecting dpdk library targets, it will be used when defining dpdk::dpdk
 set(_dpdk_libs)
-- 
2.39.5