From patchwork Fri Nov 29 17:10:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Laatz X-Patchwork-Id: 63398 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id AE203A04E0; Fri, 29 Nov 2019 18:11:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4765C1BF84; Fri, 29 Nov 2019 18:10:54 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id AEADC1BF72 for ; Fri, 29 Nov 2019 18:10:49 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Nov 2019 09:10:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,257,1571727600"; d="scan'208";a="409684893" Received: from silpixa00399838.ir.intel.com (HELO silpixa00399838.ger.corp.intel.com) ([10.237.222.120]) by fmsmga005.fm.intel.com with ESMTP; 29 Nov 2019 09:10:47 -0800 From: Kevin Laatz To: dev@dpdk.org Cc: david.marchand@redhat.com, thomas@monjalon.net, bruce.richardson@intel.com, ray.kinsella@intel.com, Kevin Laatz Date: Fri, 29 Nov 2019 17:10:24 +0000 Message-Id: <20191129171024.56165-8-kevin.laatz@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191129171024.56165-1-kevin.laatz@intel.com> References: <20191023010754.65172-1-kevin.laatz@intel.com> <20191129171024.56165-1-kevin.laatz@intel.com> Subject: [dpdk-dev] [PATCH v2 7/7] build: clean up experimental syms check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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/'