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 14721A04F5; Thu, 12 Dec 2019 13:30:28 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 70EE8374C; Thu, 12 Dec 2019 13:30:27 +0100 (CET) Received: from relay0229.mxlogin.com (relay0229.mxlogin.com [199.181.239.229]) by dpdk.org (Postfix) with ESMTP id A3AFB2BD3 for ; Thu, 12 Dec 2019 13:30:25 +0100 (CET) Received: from filter004.mxroute.com (unknown [94.130.183.33]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay0229.mxlogin.com (Postfix) with ESMTPS id B1F57CD3031E; Thu, 12 Dec 2019 06:30:24 -0600 (CST) Received: from galaxy.mxroute.com (unknown [23.92.70.113]) by filter004.mxroute.com (Postfix) with ESMTPS id 213623E994; Thu, 12 Dec 2019 12:30:22 +0000 (UTC) Received: from irdmzpr02-ext.ir.intel.com ([192.198.151.37]) by galaxy.mxroute.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1ifNMn-00027W-VU; Thu, 12 Dec 2019 07:14:50 -0500 To: Bruce Richardson , dev@dpdk.org Cc: thomas@monjalon.net, ray.kinsella@intel.com, ferruh.yigit@intel.com, bluca@debian.org References: <20191211102642.983579-1-bruce.richardson@intel.com> <20191212115826.2167871-1-bruce.richardson@intel.com> From: Ray Kinsella Openpgp: preference=signencrypt Autocrypt: addr=mdr@ashroe.eu; keydata= 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 Message-ID: <5c37f667-0feb-1bb3-6b9e-96739f59d8cc@ashroe.eu> Date: Thu, 12 Dec 2019 12:30:19 +0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.1 MIME-Version: 1.0 In-Reply-To: <20191212115826.2167871-1-bruce.richardson@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-AuthUser: mdr@ashroe.eu Subject: Re: [dpdk-dev] [PATCH v3] build: fix soname info for 19.11 compatiblity 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 12/12/2019 11:58, Bruce Richardson wrote: > 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. > > This patch fixes the issue by switching from 2-part to 3-part ABI version > numbers so that we can keep 20.0 as soname and using the final digits to > identify the 20.x releases which are ABI compatible. This requires changes > to both make and meson builds to handle the three-digit version and shrink > it to 2-digit for soname. > > The final fix needed in this patch is to adjust the library version number > for the ethtool example library, which needs to be upped to 2-digits, as > external libraries using the DPDK build system also use the logic in this > file. > > Fixes: cba806e07d6f ("build: change ABI versioning to global") > > Signed-off-by: Thomas Monjalon > Signed-off-by: Bruce Richardson > --- > > V3: > * fixed issues with building ethtool example app. > V2: > * adjusted the meson version to work correctly with both 2-part and > 3-part ABI versions, so it will work correctly even with no changes > for a 21.x ABI version number > * adjusted the versions of the experimental libs so that they are > consistent between meson and make, and also consistent with v19.11 > > --- > ABI_VERSION | 2 +- > config/meson.build | 16 +++++++++++++--- > drivers/meson.build | 4 ++-- > examples/ethtool/lib/Makefile | 2 +- > lib/meson.build | 4 ++-- > mk/rte.lib.mk | 13 ++++++++----- > 6 files changed, 27 insertions(+), 14 deletions(-) > > diff --git a/ABI_VERSION b/ABI_VERSION > index 2e73f8d2a..fcc01369a 100644 > --- a/ABI_VERSION > +++ b/ABI_VERSION > @@ -1 +1 @@ > -20.1 > +20.0.1 > diff --git a/config/meson.build b/config/meson.build > index 364a8d739..01911ecf9 100644 > --- a/config/meson.build > +++ b/config/meson.build > @@ -20,9 +20,19 @@ pver = meson.project_version().split('.') > major_version = '@0@.@1@'.format(pver.get(0), pver.get(1)) > abi_version = run_command(find_program('cat', 'more'), > abi_version_file).stdout().strip() > -# experimental libraries are versioned as 0.majorminor versions, e.g. 0.201 > -ever = abi_version.split('.') > -experimental_abi_version = '0.@0@@1@'.format(ever.get(0), ever.get(1)) > + > +# Regular libraries have the abi_version as the filename extension > +# and have the soname be all but the final part of the abi_version. > +# Experimental libraries have soname with '0.major' > +# and the filename suffix as 0.majorminor versions, > +# e.g. v20.1 => librte_stable.so.20.1, librte_experimental.so.0.201 > +# sonames => librte_stable.so.20, librte_experimental.so.0.20 > +# e.g. v20.0.1 => librte_stable.so.20.0.1, librte_experimental.so.0.2001 > +# 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('.')) > > # extract all version information into the build configuration > dpdk_conf.set('RTE_VER_YEAR', pver.get(0).to_int()) > diff --git a/drivers/meson.build b/drivers/meson.build > index 72eec4608..4b17662b7 100644 > --- a/drivers/meson.build > +++ b/drivers/meson.build > @@ -132,10 +132,10 @@ foreach class:dpdk_driver_classes > > if is_experimental != 0 > lib_version = experimental_abi_version > - so_version = experimental_abi_version > + so_version = experimental_so_version > else > lib_version = abi_version > - so_version = abi_version > + so_version = stable_so_version > endif > > # now build the static driver > diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile > index 9da7dc3ba..649474127 100644 > --- a/examples/ethtool/lib/Makefile > +++ b/examples/ethtool/lib/Makefile > @@ -18,7 +18,7 @@ endif > # library name > LIB = librte_ethtool.a > > -LIBABIVER := 1 > +LIBABIVER := 0.1 > > # all source are stored in SRC-Y > SRCS-y := rte_ethtool.c > diff --git a/lib/meson.build b/lib/meson.build > index 6ceb5e756..0af3efab2 100644 > --- a/lib/meson.build > +++ b/lib/meson.build > @@ -113,10 +113,10 @@ foreach l:libraries > > if is_experimental != 0 > lib_version = experimental_abi_version > - so_version = experimental_abi_version > + so_version = experimental_so_version > else > lib_version = abi_version > - so_version = abi_version > + so_version = stable_so_version > endif > > # first build static lib > diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk > index 655a1b143..b1a8372cc 100644 > --- a/mk/rte.lib.mk > +++ b/mk/rte.lib.mk > @@ -11,14 +11,16 @@ EXTLIB_BUILD ?= n > # VPATH contains at least SRCDIR > VPATH += $(SRCDIR) > > -ifneq ($(shell grep -s "^DPDK_" $(SRCDIR)/$(EXPORT_MAP)),) > -LIBABIVER := $(shell cat $(RTE_SRCDIR)/ABI_VERSION) > -else ifeq ($(LIBABIVER),) > +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 cat $(RTE_SRCDIR)/ABI_VERSION | tr -d '.') > +LIBABIVER := 0.$(shell echo $(LIBABIVER) | tr -d '.') > +SOVER := 0.$(shell echo $(SOVER) | tr -d '.') > endif > > ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) > +SONAME := $(patsubst %.a,%.so.$(SOVER),$(LIB)) > LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) > ifeq ($(EXTLIB_BUILD),n) > CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) > @@ -74,7 +76,7 @@ NO_UNDEFINED := -z defs > endif > > O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \ > - -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(LIB) -o $(LIB) > + -shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(SONAME) -o $(LIB) > O_TO_S_STR = $(subst ','\'',$(O_TO_S)) #'# fix syntax highlight > O_TO_S_DISP = $(if $(V),"$(O_TO_S_STR)"," LD $(@)") > O_TO_S_DO = @set -e; \ > @@ -133,6 +135,7 @@ $(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)/') > endif > > # > My input is still the same, I think a respin to fix v19.11 is preferable. However this patch does fix the issue. V19.11 [root@silpixa00396680 build]# readelf -d ./lib/librte_eal.so.20.0 | grep SONAME 11: 0x000000000000000e (SONAME) Library soname: [librte_eal.so.20.0] HEAD [root@silpixa00396680 build]# readelf -d ./lib/librte_eal.so.20.1 | grep SONAME 11: 0x000000000000000e (SONAME) Library soname: [librte_eal.so.20.1] HEAD + FIX [root@silpixa00396680 build]# readelf -d ./lib/librte_eal.so.20.0.1 | grep SONAME 11: 0x000000000000000e (SONAME) Library soname: [librte_eal.so.20.0] Thanks, Ray K