build: fix soname info in meson build

Message ID 20191210171726.639607-1-bruce.richardson@intel.com (mailing list archive)
State Superseded, archived
Headers
Series build: fix soname info in meson build |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/travis-robot warning Travis build: failed

Commit Message

Bruce Richardson Dec. 10, 2019, 5:17 p.m. UTC
  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(-)
  

Patch

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,