X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fmeson.build;h=3acc67e6ed434836650c2871e7c22fa5cd8087bd;hb=806c45dd483d;hp=d88b0211e93b8a6383bef349b4f8813b2e71b718;hpb=092ee516496dc8183c0944280484a6e5d923c7f3;p=dpdk.git diff --git a/lib/meson.build b/lib/meson.build index d88b0211e9..3acc67e6ed 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -26,6 +26,12 @@ libraries = [ 'compat', # just a header, used for versioning # flow_classify lib depends on pkt framework table lib 'flow_classify', 'bpf'] +default_cflags = machine_args +if cc.has_argument('-Wno-format-truncation') + default_cflags += '-Wno-format-truncation' +endif + +enabled_libs = [] # used to print summary at the end foreach l:libraries build = true name = l @@ -34,29 +40,24 @@ foreach l:libraries sources = [] headers = [] includes = [] - cflags = machine_args - if cc.has_argument('-Wno-format-truncation') - cflags += '-Wno-format-truncation' - endif - + cflags = default_cflags objs = [] # other object files to link against, used e.g. for # instruction-set optimized versions of code # use "deps" for internal DPDK dependencies, and "ext_deps" for # external package/library requirements ext_deps = [] - deps = ['eal'] # eal is standard dependency except for itself - if l == 'kvargs' - deps = [] - endif - if l == 'eal' - deps = ['kvargs'] + deps = [] + # eal is standard dependency once built + if dpdk_conf.has('RTE_LIBRTE_EAL') + deps += ['eal'] endif dir_name = 'librte_' + l subdir(dir_name) if build + enabled_libs += name dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) install_headers(headers) @@ -71,6 +72,10 @@ foreach l:libraries shared_deps = ext_deps static_deps = ext_deps foreach d:deps + if not is_variable('shared_rte_' + d) + error('Missing dependency ' + d + + ' for library ' + lib_name) + endif shared_deps += [get_variable('shared_rte_' + d)] static_deps += [get_variable('static_rte_' + d)] endforeach