From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, ray.kinsella@intel.com,
ferruh.yigit@intel.com, bluca@debian.org,
Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH] build: fix soname info for 19.11 compatiblity
Date: Wed, 11 Dec 2019 10:26:42 +0000 [thread overview]
Message-ID: <20191211102642.983579-1-bruce.richardson@intel.com> (raw)
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.
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>
---
This patch contains an alternative fix to that implied by the previous patches:
http://patches.dpdk.org/patch/63726/
http://patches.dpdk.org/patch/63728/
---
ABI_VERSION | 2 +-
drivers/meson.build | 4 ++--
lib/meson.build | 4 ++--
mk/rte.lib.mk | 5 ++++-
4 files changed, 9 insertions(+), 6 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/drivers/meson.build b/drivers/meson.build
index 72eec4608..5f1d72071 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -132,11 +132,11 @@ 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
+ so_version = lib_version.split('.')
+ so_version = so_version[0] + '.' + so_version[1]
# now build the static driver
static_lib = static_library(lib_name,
diff --git a/lib/meson.build b/lib/meson.build
index 6ceb5e756..3b7dad348 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -113,11 +113,11 @@ 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
+ so_version = lib_version.split('.')
+ so_version = so_version[0] + '.' + so_version[1]
# first build static lib
static_lib = static_library(libname,
diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk
index 655a1b143..4b4267021 100644
--- a/mk/rte.lib.mk
+++ b/mk/rte.lib.mk
@@ -19,6 +19,8 @@ LIBABIVER := 0.$(shell cat $(RTE_SRCDIR)/ABI_VERSION | tr -d '.')
endif
ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+SOVER := $(basename $(LIBABIVER))
+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
#
--
2.23.0
next reply other threads:[~2019-12-11 10:31 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 10:26 Bruce Richardson [this message]
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
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=20191211102642.983579-1-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--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).