From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D58C2C43603 for ; Wed, 11 Dec 2019 18:22:33 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 7D3C320663 for ; Wed, 11 Dec 2019 18:22:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7D3C320663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A184E1BF31; Wed, 11 Dec 2019 19:22:25 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 0DE681BE3D for ; Wed, 11 Dec 2019 19:22:22 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2019 10:22:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,302,1571727600"; d="scan'208";a="203655561" Received: from silpixa00399838.ir.intel.com (HELO silpixa00399838.ger.corp.intel.com) ([10.237.222.157]) by orsmga007.jf.intel.com with ESMTP; 11 Dec 2019 10:22:20 -0800 From: Kevin Laatz To: dev@dpdk.org Cc: thomas@monjalon.net, david.marchand@redhat.com, bruce.richardson@intel.com, ray.kinsella@intel.com, Kevin Laatz Date: Wed, 11 Dec 2019 18:21:47 +0000 Message-Id: <20191211182147.19355-4-kevin.laatz@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191211182147.19355-1-kevin.laatz@intel.com> References: <20191129210905.1865-1-kevin.laatz@intel.com> <20191211182147.19355-1-kevin.laatz@intel.com> Subject: [dpdk-dev] [PATCH v4 3/3] 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" Archived-At: List-Archive: 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 db58a67b9..4f4c93b73 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 abidiff.found() + # 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, '--no-added-syms', '--suppr', abignore, diff --git a/lib/meson.build b/lib/meson.build index f0aba6635..b0f915969 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 abidiff.found() + # 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, '--no-added-syms', '--suppr', abignore, -- 2.17.1