X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fmeson.build;h=499d26060fddcc980a770ee02a95883c5ae64b5f;hb=07baabb6a51a2d6a8cfcdc52acee2ce629f5c22e;hp=64a59abab6446621fa1fe89d4f14f718707e3309;hpb=7d5cfaa7508de0fd248b05effbf421a98317006a;p=dpdk.git diff --git a/lib/meson.build b/lib/meson.build index 64a59abab6..499d26060f 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -27,6 +27,7 @@ libraries = [ 'acl', 'bbdev', 'bitratestats', + 'bpf', 'cfgfile', 'compressdev', 'cryptodev', @@ -41,10 +42,11 @@ libraries = [ 'latencystats', 'lpm', 'member', + 'pcapng', 'power', - 'pdump', 'rawdev', 'regexdev', + 'dmadev', 'rib', 'reorder', 'sched', @@ -54,33 +56,14 @@ libraries = [ 'ipsec', # ipsec lib depends on net, crypto and security 'fib', #fib lib depends on rib 'port', # pkt framework libs which use other libs from above + 'pdump', # pdump lib depends on bpf 'table', 'pipeline', 'flow_classify', # flow_classify lib depends on pkt framework table lib - 'bpf', 'graph', 'node', ] -if is_windows - libraries = [ - 'kvargs', - 'telemetry', - 'eal', - 'ring', - 'rcu', - 'mempool', - 'mbuf', - 'net', - 'meter', - 'ethdev', - 'pci', - 'cmdline', - 'hash', - 'cfgfile', - ] # only supported libraries for windows -endif - optional_libs = [ 'kni', 'power', @@ -88,7 +71,8 @@ optional_libs = [ ] disabled_libs = [] -opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs')).stdout().split() +opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs'), + check: true).stdout().split() foreach l:opt_disabled_libs if not optional_libs.contains(l) warning('Cannot disable mandatory library "@0@"'.format(l)) @@ -170,13 +154,14 @@ foreach l:libraries libname = 'rte_' + name includes += include_directories(l) - if is_windows and use_function_versioning + if developer_mode and is_windows and use_function_versioning message('@0@: Function versioning is not supported by Windows.'.format(name)) endif if use_function_versioning cflags += '-DRTE_USE_FUNCTION_VERSIONING' endif + cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=lib.' + l # first build static lib static_lib = static_library(libname, @@ -227,7 +212,7 @@ foreach l:libraries endif lk_deps = [version_map, def_file, mingw_map] - if not is_windows + if developer_mode and not is_windows # on unix systems check the output of the # check-symbols.sh script, using it as a # dependency of the .so build