From patchwork Tue Dec 10 17:17:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 63726 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 2A25CA04F0; Tue, 10 Dec 2019 18:17:36 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 393101BDFD; Tue, 10 Dec 2019 18:17:34 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id C0C821BC25 for ; Tue, 10 Dec 2019 18:17:32 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Dec 2019 09:17:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,300,1571727600"; d="scan'208";a="238241088" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga004.fm.intel.com with ESMTP; 10 Dec 2019 09:17:30 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Tue, 10 Dec 2019 17:17:26 +0000 Message-Id: <20191210171726.639607-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] build: fix soname info in meson build 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" The soname for each stable ABI version should be just the ABI version major number without the minor number. Unfortunately both major and minor were used causing version 20.1 to be incompatible with 20.0. For meson we can fix this by removing the explicit setting of the soversion for each shared library. The default meson behaviour is the exact behaviour we want. Fixes: cba806e07d6f ("build: change ABI versioning to global") Signed-off-by: Bruce Richardson --- drivers/meson.build | 3 --- lib/meson.build | 3 --- 2 files changed, 6 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 72eec4608..033338ea7 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -132,10 +132,8 @@ foreach class:dpdk_driver_classes if is_experimental != 0 lib_version = experimental_abi_version - so_version = experimental_abi_version else lib_version = abi_version - so_version = abi_version endif # now build the static driver @@ -183,7 +181,6 @@ foreach class:dpdk_driver_classes link_args: lk_args, link_depends: lk_deps, version: lib_version, - soversion: so_version, install: true, install_dir: driver_install_path) diff --git a/lib/meson.build b/lib/meson.build index 6ceb5e756..62a196271 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -113,10 +113,8 @@ foreach l:libraries if is_experimental != 0 lib_version = experimental_abi_version - so_version = experimental_abi_version else lib_version = abi_version - so_version = abi_version endif # first build static lib @@ -174,7 +172,6 @@ foreach l:libraries link_args: lk_args, link_depends: lk_deps, version: lib_version, - soversion: so_version, install: true) shared_dep = declare_dependency(link_with: shared_lib, include_directories: includes,