From patchwork Wed Dec 11 10:26:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 63750 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7B102A04F6; Wed, 11 Dec 2019 11:31:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B3E0A2C6A; Wed, 11 Dec 2019 11:31:36 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 8522D1D9E for ; Wed, 11 Dec 2019 11:31:34 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2019 02:26:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,301,1571727600"; d="scan'208";a="363556726" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga004.jf.intel.com with ESMTP; 11 Dec 2019 02:26:47 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, ray.kinsella@intel.com, ferruh.yigit@intel.com, bluca@debian.org, Bruce Richardson Date: Wed, 11 Dec 2019 10:26:42 +0000 Message-Id: <20191211102642.983579-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] 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" 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 Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- 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 #