X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Fmeson.build;h=5ac94cd5b2459c2324d033ed04564fb95e4b4e15;hb=a2da742768bdd5943718342a7c9a65add3dc5ffa;hp=595314d7d13099a4d8a936c6b2c29f6a3e120bd1;hpb=05d3b5283cc1a61b2e204ddd6bc30b6f3053f280;p=dpdk.git diff --git a/lib/meson.build b/lib/meson.build index 595314d7d1..5ac94cd5b2 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -11,8 +11,10 @@ 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 + 'ring', + 'rcu', # rcu depends on 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 @@ -22,33 +24,35 @@ libraries = [ 'gro', 'gso', 'ip_frag', 'jobstats', 'kni', 'latencystats', 'lpm', 'member', 'power', 'pdump', 'rawdev', - 'reorder', 'sched', 'security', 'stack', 'vhost', - #ipsec lib depends on crypto and security + 'rib', 'reorder', 'sched', 'security', 'stack', 'vhost', + # ipsec lib depends on net, crypto and security 'ipsec', + #fib lib depends on rib + 'fib', # add pkt framework libs which use other libs from above 'port', 'table', 'pipeline', # flow_classify lib depends on pkt framework table lib - 'flow_classify', 'bpf', 'telemetry'] + 'flow_classify', 'bpf', 'graph', 'telemetry'] -if host_machine.system() == 'windows' +if is_windows libraries = ['kvargs','eal'] # only supported libraries for windows endif default_cflags = machine_args +default_cflags += ['-DALLOW_EXPERIMENTAL_API'] +default_cflags += ['-DALLOW_INTERNAL_API'] + if cc.has_argument('-Wno-format-truncation') default_cflags += '-Wno-format-truncation' endif enabled_libs = [] # used to print summary at the end -# -D_GNU_SOURCE unconditionally -default_cflags += '-D_GNU_SOURCE' - foreach l:libraries build = true + reason = '' # set if build == false to explain why name = l - version = 1 - allow_experimental_apis = false + use_function_versioning = false sources = [] headers = [] includes = [] @@ -69,6 +73,22 @@ foreach l:libraries 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) + else enabled_libs += name dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) install_headers(headers) @@ -81,27 +101,23 @@ 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' + + if use_function_versioning + cflags += '-DRTE_USE_FUNCTION_VERSIONING' endif - if get_option('per_library_versions') - lib_version = '@0@.1'.format(version) - so_version = '@0@'.format(version) + version_map = '@0@/@1@/rte_@2@_version.map'.format( + meson.current_source_dir(), dir_name, name) + + is_stable = run_command(is_stable_cmd, + files(version_map)).returncode() == 0 + + if is_stable + lib_version = abi_version + so_version = stable_so_version else - lib_version = major_version - so_version = major_version + lib_version = experimental_abi_version + so_version = experimental_so_version endif # first build static lib @@ -116,20 +132,44 @@ foreach l:libraries include_directories: includes, dependencies: static_deps) - # then use pre-build objects to build shared lib - sources = [] - objs += static_lib.extract_all_objects(recursive: false) + if not use_function_versioning + # use pre-build objects to build shared lib + sources = [] + objs += static_lib.extract_all_objects(recursive: false) + else + # for compat we need to rebuild with + # RTE_BUILD_SHARED_LIB defined + cflags += '-DRTE_BUILD_SHARED_LIB' + endif version_map = '@0@/@1@/rte_@2@_version.map'.format( meson.current_source_dir(), dir_name, name) - exports = [] implib = dir_name + '.dll.a' - if host_machine.system() == 'windows' - exports = '@0@/@1@/rte_@2@_exports.def'.format( - meson.current_source_dir(), dir_name, name) - lk_args = ['-Wl,/def:' + exports, '-Wl,/implib:lib\\' + implib] + + def_file = custom_target(name + '_def', + command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'], + input: version_map, + output: 'rte_@0@_exports.def'.format(name)) + + if is_ms_linker + lk_args = ['-Wl,/def:' + def_file.full_path(), + '-Wl,/implib:lib\\' + implib] else lk_args = ['-Wl,--version-script=' + version_map] endif + + lk_deps = [version_map, def_file] + if not is_windows + # on unix systems check the output of the + # check-symbols.sh script, using it as a + # dependency of the .so build + lk_deps += custom_target(name + '.sym_chk', + command: [check_symbols, + version_map, '@INPUT@'], + capture: true, + input: static_lib, + output: name + '.sym_chk') + endif + shared_lib = shared_library(libname, sources, objects: objs, @@ -137,7 +177,7 @@ foreach l:libraries dependencies: shared_deps, include_directories: includes, link_args: lk_args, - link_depends: [version_map, exports], + link_depends: lk_deps, version: lib_version, soversion: so_version, install: true) @@ -149,7 +189,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