This patch cleans up the meson build files in lib and drivers by moving the
custom target for checking the experimental syms next to the abi compat
checks. This also removes the dependency on the check for the shared build,
which was not required by anything, but was only added to force the
experimental syms check run.
Signed-off-by: Kevin Laatz <kevin.la...@intel.com>
---
drivers/meson.build | 21 +++++++++++----------
lib/meson.build | 21 +++++++++++----------
2 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index e19eed419..9b0955722 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -163,15 +163,6 @@ foreach class:dpdk_driver_classes
'-Wl,/implib:lib\\' + implib]
else
lk_args = ['-Wl,--version-script=' +
version_map]
- # on unix systems check the output of the
- # experimental syms script, using it as a
- # dependency of the .so build
- lk_deps += custom_target(lib_name + '.exp_chk',
- command: [check_experimental_syms,
- version_map, '@INPUT@'],
- capture: true,
- input: static_lib,
- output: lib_name + '.exp_chk')
endif
shared_lib = shared_library(lib_name,
@@ -181,7 +172,6 @@ foreach class:dpdk_driver_classes
dependencies: shared_deps,
c_args: cflags,
link_args: lk_args,
- link_depends: lk_deps,
version: lib_version,
soversion: so_version,
install: true,
@@ -197,6 +187,17 @@ foreach class:dpdk_driver_classes
dependencies: static_deps)
if not is_windows and get_option('compat_checks')
+ # on unix systems check the output of the
+ # experimental syms script
+ custom_target(lib_name + '.exp_chk',
+ command: [check_experimental_syms,
+ version_map, '@INPUT@'],
+ capture: true,
+ input: static_lib,
+ output: lib_name + '.exp_chk',
+ install: false,
+ build_by_default: true)
+
custom_target('lib' + lib_name + '.abi_chk',
command: [abidiff,
meson.source_root() +
'/drivers/abi/lib'
diff --git a/lib/meson.build b/lib/meson.build
index 69ea3a2b0..c448d9dff 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -154,15 +154,6 @@ foreach l:libraries
'-Wl,/implib:lib\\' + implib]
else
lk_args = ['-Wl,--version-script=' +
version_map]
- # on unix systems check the output of the
- # experimental syms script, using it as a
- # dependency of the .so build
- lk_deps += custom_target(name + '.exp_chk',
- command: [check_experimental_syms,
- version_map, '@INPUT@'],
- capture: true,
- input: static_lib,
- output: name + '.exp_chk')
endif
shared_lib = shared_library(libname,
@@ -172,7 +163,6 @@ foreach l:libraries
dependencies: shared_deps,
include_directories: includes,
link_args: lk_args,
- link_depends: lk_deps,
version: lib_version,
soversion: so_version,
install: true)
@@ -181,6 +171,17 @@ foreach l:libraries
dependencies: shared_deps)
if not is_windows and get_option('compat_checks')
+ # on unix systems check the output of the
+ # experimental syms script
+ custom_target(name + '.exp_chk',
+ command: [check_experimental_syms,
+ version_map, '@INPUT@'],
+ capture: true,
+ input: static_lib,
+ output: name + '.exp_chk',
+ install: false,
+ build_by_default: true)
+
custom_target(dir_name + '.abi_chk',
command: [abidiff,
meson.source_root() +
'/lib/abi/'
--
2.17.1
