vhost: flush batched enqueue descs directly

[dpdk.git] / lib / meson.build

diff --git a/lib/meson.build b/lib/meson.build
index 5ddf1ca..8ea3671 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -11,8 +11,8 @@
 libraries = [
        'kvargs', # eal depends on kvargs
        'eal', # everything depends on eal
-       'cmdline', # ethdev depends on cmdline for parsing functions
        'ring', 'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core
+       'cmdline',
        'metrics', # bitrate/latency stats depends on this
        'hash',    # efd depends on this
        'timer',   # eventdev depends on this
@@ -23,7 +23,7 @@ libraries = [
        'kni', 'latencystats', 'lpm', 'member',
        'power', 'pdump', 'rawdev',
        'rcu', 'reorder', 'sched', 'security', 'stack', 'vhost',
-       #ipsec lib depends on crypto and security
+       # ipsec lib depends on net, crypto and security
        'ipsec',
        # add pkt framework libs which use other libs from above
        'port', 'table', 'pipeline',
@@ -66,6 +66,19 @@ foreach l:libraries
        dir_name = 'librte_' + l
        subdir(dir_name)
 
+       if build
+               shared_deps = ext_deps
+               static_deps = ext_deps
+               foreach d:deps
+                       if not is_variable('shared_rte_' + d)
+                               error('Missing internal dependency "@0@" for @1@ [@2@]'
+                                               .format(d, name, 'lib/' + dir_name))
+                       endif
+                       shared_deps += [get_variable('shared_rte_' + d)]
+                       static_deps += [get_variable('static_rte_' + d)]
+               endforeach
+       endif
+
        if not build
                dpdk_libs_disabled += name
                set_variable(name.underscorify() + '_disable_reason', reason)
@@ -82,16 +95,6 @@ foreach l:libraries
                        shared_dep = declare_dependency(include_directories: includes)
                        static_dep = shared_dep
                else
-                       shared_deps = ext_deps
-                       static_deps = ext_deps
-                       foreach d:deps
-                               if not is_variable('shared_rte_' + d)
-                                       error('Missing dependency ' + d +
-                                               ' for library ' + libname)
-                               endif
-                               shared_deps += [get_variable('shared_rte_' + d)]
-                               static_deps += [get_variable('static_rte_' + d)]
-                       endforeach
 
                        if allow_experimental_apis
                                cflags += '-DALLOW_EXPERIMENTAL_API'
@@ -154,7 +157,9 @@ foreach l:libraries
                        dpdk_static_libraries = [static_lib] + dpdk_static_libraries
                endif # sources.length() > 0
 
-               set_variable('shared_' + libname, shared_dep)
-               set_variable('static_' + libname, static_dep)
+               set_variable('shared_rte_' + name, shared_dep)
+               set_variable('static_rte_' + name, static_dep)
+               message('lib/@0@: Defining dependency "@1@"'.format(
+                               dir_name, name))
        endif # if build
 endforeach