X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fmeson.build;h=24adbe44c9a6c740062daefedc3410e203899d07;hb=ec487c189686ee9b3b7551d3aca138cec3f91e74;hp=961b95f4adf19a19ba6e7c9a368f6ddd860e4930;hpb=bb9be9a45e01e09caaf3e57b0c2c68c87a925b01;p=dpdk.git

diff --git a/lib/meson.build b/lib/meson.build
index 961b95f4ad..24adbe44c9 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -3,7 +3,7 @@
 
 
 # process all libraries equally, as far as possible
-# "core" libs first, then others alphebetically as far as possible
+# "core" libs first, then others alphabetically as far as possible
 # NOTE: for speed of meson runs, the dependencies in the subdirectories
 # sometimes skip deps that would be implied by others, e.g. if mempool is
 # given as a dep, no need to mention ring. This is especially true for the
@@ -67,13 +67,21 @@ libraries = [
 
 optional_libs = [
         'bitratestats',
+        'cfgfile',
+        'flow_classify',
+        'gpudev',
         'gro',
         'gso',
         'kni',
         'jobstats',
         'latencystats',
         'metrics',
+        'node',
+        'pdump',
+        'pipeline',
+        'port',
         'power',
+        'table',
         'vhost',
 ]
 
@@ -132,23 +140,29 @@ foreach l:libraries
         warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
     endif
 
-    if not build
-        dpdk_libs_disabled += name
-        set_variable(name.underscorify() + '_disable_reason', reason)
-        continue
-    endif
-
     shared_deps = ext_deps
     static_deps = ext_deps
     foreach d:deps
+        if not build
+            break
+        endif
         if not is_variable('shared_rte_' + d)
-            error('Missing internal dependency "@0@" for @1@ [@2@]'
+            build = false
+            reason = 'missing internal dependency, "@0@"'.format(d)
+            message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
                     .format(d, name, 'lib/' + l))
+        else
+            shared_deps += [get_variable('shared_rte_' + d)]
+            static_deps += [get_variable('static_rte_' + d)]
         endif
-        shared_deps += [get_variable('shared_rte_' + d)]
-        static_deps += [get_variable('static_rte_' + d)]
     endforeach
 
+    if not build
+        dpdk_libs_disabled += name
+        set_variable(name.underscorify() + '_disable_reason', reason)
+        continue
+    endif
+
     enabled_libs += name
     dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
     install_headers(headers)
@@ -157,6 +171,7 @@ foreach l:libraries
         install_headers(driver_sdk_headers)
     endif
     dpdk_chkinc_headers += headers
+    dpdk_chkinc_headers += driver_sdk_headers
 
     libname = 'rte_' + name
     includes += include_directories(l)