From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A995A0525; Fri, 21 Feb 2020 13:36:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0E6891BFAC; Fri, 21 Feb 2020 13:36:37 +0100 (CET) Received: from qrelay83.mxroute.com (qrelay83.mxroute.com [172.82.139.83]) by dpdk.org (Postfix) with ESMTP id 6813434F3 for ; Fri, 21 Feb 2020 13:36:35 +0100 (CET) Received: from filter003.mxroute.com ([168.235.111.26] 168-235-111-26.cloud.ramnode.com) (Authenticated sender: mN4UYu2MZsgR) by qrelay83.mxroute.com (ZoneMTA) with ESMTPA id 17067bfd3d9000088e.002 for ; Fri, 21 Feb 2020 12:36:29 +0000 X-Zone-Loop: eb0ad5fb08485182de761b8a1ca99a589e3b3b9b7bb6 X-Originating-IP: [168.235.111.26] Received: from galaxy.mxroute.com (unknown [23.92.70.113]) by filter003.mxroute.com (Postfix) with ESMTPS id 4DDD060034; Fri, 21 Feb 2020 12:36:24 +0000 (UTC) Received: from irdmzpr01-ext.ir.intel.com ([192.198.151.36]) by galaxy.mxroute.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1j57Ct-00059c-0E; Fri, 21 Feb 2020 07:14:59 -0500 To: Ferruh Yigit , Thomas Monjalon , Neil Horman , Bruce Richardson Cc: dev@dpdk.org, ray.kinsella@intel.com, bluca@debian.org, david.marchand@redhat.com, ktraynor@redhat.com References: <20200220195454.2363094-1-ferruh.yigit@intel.com> From: Ray Kinsella Autocrypt: addr=mdr@ashroe.eu; keydata= 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 Message-ID: <98256ef2-b100-9f60-67d2-dc8ff106f680@ashroe.eu> Date: Fri, 21 Feb 2020 12:36:17 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200220195454.2363094-1-ferruh.yigit@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-AuthUser: mdr@ashroe.eu Subject: Re: [dpdk-dev] [PATCH] build: fix experimental library versioning 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" On 20/02/2020 19:54, Ferruh Yigit wrote: > The problem occurred when workaround that makes soname two digits > applied. With this change for the ABI version "20.0.1" the experimental > library version become ".so.2001". > After workaround removed in ABI version 21.0, the experimental library > version will become ".so.210". > "2001" is bigger value than "201" although it is a previous version of > the library version, this can break the version comparisons. > > To fix this, introducing a temporary sub level versioning for the > experimental libraries, so that minor version comparison will continue > to work. > > After change experimental libraries will follow below versioning: > > DPDK version ABI version soname library name > ------------ ----------- ------ ------------ > DPDK 19.11 20.0 .so.0.200 .so.0.200 > DPDK 20.02 20.0.1 .so.0.200.1 .so.0.200.1 > DPDK 20.05 20.0.2 .so.0.200.2 .so.0.200.2 > DPDK 20.11 21.0 .so.0.210 .so.0.210 > DPDK 21.02 21.1 .so.0.211 .so.0.211 > > Note: After workaround removed in DPDK 20.11 and soname switch back to > single digit this patch won't work and needs to be updated. > > Fixes: f26c2b39b271 ("build: fix soname info for 19.11 compatibility") > Acked-by: Ray Kinsella > Signed-off-by: Ferruh Yigit > --- > Cc: Thomas Monjalon > Cc: ray.kinsella@intel.com > Cc: nhorman@tuxdriver.com > Cc: bruce.richardson@intel.com > Cc: bluca@debian.org > Cc: david.marchand@redhat.com > Cc: ktraynor@redhat.com > --- > config/meson.build | 4 ++-- > mk/rte.lib.mk | 8 +++++--- > 2 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/config/meson.build b/config/meson.build > index 6c46767e3..d3d2370ce 100644 > --- a/config/meson.build > +++ b/config/meson.build > @@ -31,8 +31,8 @@ abi_version = run_command(find_program('cat', 'more'), > # sonames => librte_stable.so.20.0, librte_experimental.so.0.200 > abi_va = abi_version.split('.') > stable_so_version = abi_va.length() == 2 ? abi_va[0] : abi_va[0] + '.' + abi_va[1] > -experimental_abi_version = '0.' + ''.join(abi_va) > -experimental_so_version = '0.' + ''.join(stable_so_version.split('.')) > +experimental_abi_version = '0.' + abi_va[0] + abi_va[1] + '.' + abi_va[2] > +experimental_so_version = experimental_abi_version > > # extract all version information into the build configuration > dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int()) > diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk > index b1a8372cc..682b590db 100644 > --- a/mk/rte.lib.mk > +++ b/mk/rte.lib.mk > @@ -15,8 +15,8 @@ LIBABIVER ?= $(shell cat $(RTE_SRCDIR)/ABI_VERSION) > SOVER := $(basename $(LIBABIVER)) > ifeq ($(shell grep -s "^DPDK_" $(SRCDIR)/$(EXPORT_MAP)),) > # EXPERIMENTAL ABI is versioned as 0.major+minor, e.g. 0.201 for 20.1 ABI > -LIBABIVER := 0.$(shell echo $(LIBABIVER) | tr -d '.') > -SOVER := 0.$(shell echo $(SOVER) | tr -d '.') > +LIBABIVER := 0.$(shell echo $(LIBABIVER) | awk 'BEGIN { FS="." }; { print $$1$$2"."$$3 }') > +SOVER := $(LIBABIVER) > endif > > ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) > @@ -135,7 +135,9 @@ $(RTE_OUTPUT)/lib/$(LIB): $(LIB) > $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib > ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) > $(Q)ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so/') > - $(Q)ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so.$(SOVER)/') > + $(Q)if [ $(SOVER) != $(LIBABIVER) ]; then \ > + ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so.$(SOVER)/') ; \ > + fi > endif > > # >