DPDK patches and discussions
 help / color / mirror / Atom feed
From: Ray Kinsella <mdr@ashroe.eu>
To: Bruce Richardson <bruce.richardson@intel.com>, dev@dpdk.org
Cc: thomas@monjalon.net, ray.kinsella@intel.com,
	ferruh.yigit@intel.com, bluca@debian.org
Subject: Re: [dpdk-dev] [PATCH v3] build: fix soname info for 19.11 compatiblity
Date: Thu, 12 Dec 2019 16:34:42 +0000	[thread overview]
Message-ID: <e507e2f2-9afa-e389-cc58-9e8cd02aaae9@ashroe.eu> (raw)
In-Reply-To: <20191212115826.2167871-1-bruce.richardson@intel.com>



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 <thomas@monjalon.net>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
> 
> 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
>  
>  #
> 
Tested-by: Ray Kinsella <mdr@ashroe.eu>

  parent reply	other threads:[~2019-12-12 16:34 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-11 10:26 [dpdk-dev] [PATCH] " Bruce Richardson
2019-12-11 11:04 ` Luca Boccassi
2019-12-11 11:08   ` Thomas Monjalon
2019-12-11 11:14     ` Bruce Richardson
2019-12-11 11:19       ` Ferruh Yigit
2019-12-12 11:07         ` Ray Kinsella
2019-12-11 11:11   ` Bruce Richardson
2019-12-11 11:25     ` Ferruh Yigit
2019-12-12 11:14     ` Ray Kinsella
2019-12-12 13:58       ` Luca Boccassi
2019-12-12 14:05         ` Ray Kinsella
2019-12-12 15:08           ` Bruce Richardson
2019-12-11 11:15 ` Ferruh Yigit
2019-12-11 13:14   ` Bruce Richardson
2019-12-11 15:16 ` [dpdk-dev] [PATCH v2] " Bruce Richardson
2019-12-12  8:27   ` David Marchand
2019-12-12  8:57     ` Ferruh Yigit
2019-12-12 11:44       ` Bruce Richardson
2019-12-12 11:59         ` Bruce Richardson
2019-12-12 13:41           ` Thomas Monjalon
2019-12-12 11:58 ` [dpdk-dev] [PATCH v3] " Bruce Richardson
2019-12-12 12:30   ` Ray Kinsella
2019-12-12 13:02     ` Bruce Richardson
2019-12-12 15:25       ` Ray Kinsella
2019-12-12 15:34         ` Bruce Richardson
2019-12-12 14:45   ` Ferruh Yigit
2019-12-12 16:34   ` Ray Kinsella [this message]
2019-12-13 11:38   ` Neil Horman
2019-12-16 11:21   ` Laatz, Kevin
2019-12-19 12:42   ` David Marchand
2019-12-19 15:19     ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e507e2f2-9afa-e389-cc58-9e8cd02aaae9@ashroe.eu \
    --to=mdr@ashroe.eu \
    --cc=bluca@debian.org \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=ray.kinsella@intel.com \
    --cc=thomas@monjalon.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).