X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fmeson.build;h=b22c2adda76202b814fe54c9bd59ade71ce257d2;hb=6496922368fe03be9ab4137f2d615dba1a766f39;hp=d5f4e1c1f2197860a190ef83890d4573311ee056;hpb=8b8036a66e3d59ffa58afb8d96fa2c73262155a7;p=dpdk.git

diff --git a/drivers/meson.build b/drivers/meson.build
index d5f4e1c1f2..b22c2adda7 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -40,6 +40,8 @@ endif
 
 # these drivers must always be enabled, otherwise the build breaks
 always_enable = ['bus/pci', 'bus/vdev']
+# we always need a mempool driver, and ring is default, so make it mandatory
+always_enable += ['mempool/ring']
 enable_drivers += always_enable
 
 default_cflags = machine_args
@@ -100,6 +102,7 @@ foreach subpath:subdirs
         # static builds.
         ext_deps = []
         pkgconfig_extra_libs = []
+        testpmd_sources = []
 
         if not enable_drivers.contains(drv_path)
             build = false
@@ -243,7 +246,15 @@ foreach subpath:subdirs
 
         set_variable('shared_@0@'.format(lib_name), shared_dep)
         set_variable('static_@0@'.format(lib_name), static_dep)
+        # for drivers, we only need to add dependency objects for static libs,
+        # shared lib drivers are not linked in
+        dpdk_static_lib_deps += static_dep
+
         dependency_name = ''.join(lib_name.split('rte_'))
+        if testpmd_sources.length() != 0
+            testpmd_drivers_sources += testpmd_sources
+            testpmd_drivers_deps += dependency_name
+        endif
         if developer_mode
             message('drivers/@0@: Defining dependency "@1@"'.format(
                     drv_path, dependency_name))