DPDK patches and discussions
 help / color / mirror / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH] build: fix soname info in meson build
Date: Tue, 10 Dec 2019 17:17:26 +0000	[thread overview]
Message-ID: <20191210171726.639607-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.

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 <bruce.richardson@intel.com>
---
 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,
-- 
2.23.0


                 reply	other threads:[~2019-12-10 17:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20191210171726.639607-1-bruce.richardson@intel.com \
    --to=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    /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).