From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <fyigit@ecsmtp.ir.intel.com>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
 by dpdk.org (Postfix) with ESMTP id 87B19234
 for <dev@dpdk.org>; Mon,  2 Nov 2015 00:17:27 +0100 (CET)
Received: from orsmga002.jf.intel.com ([10.7.209.21])
 by orsmga102.jf.intel.com with ESMTP; 01 Nov 2015 15:17:26 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.20,230,1444719600"; d="scan'208";a="840205116"
Received: from irvmail001.ir.intel.com ([163.33.26.43])
 by orsmga002.jf.intel.com with ESMTP; 01 Nov 2015 15:17:25 -0800
Received: from sivlogin002.ir.intel.com (sivlogin002.ir.intel.com
 [10.237.217.37])
 by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id
 tA1NHOII020238; Sun, 1 Nov 2015 23:17:24 GMT
Received: from sivlogin002.ir.intel.com (localhost [127.0.0.1])
 by sivlogin002.ir.intel.com with ESMTP id tA1NHO70023513;
 Sun, 1 Nov 2015 23:17:24 GMT
Received: (from fyigit@localhost)
	by sivlogin002.ir.intel.com with œ id tA1NHNuX023509;
	Sun, 1 Nov 2015 23:17:24 GMT
From: Ferruh Yigit <ferruh.yigit@intel.com>
To: dev@dpdk.org
Date: Sun,  1 Nov 2015 23:17:22 +0000
Message-Id: <1446419842-22920-1-git-send-email-ferruh.yigit@intel.com>
X-Mailer: git-send-email 1.7.0.7
In-Reply-To: <1706989.WgznurFLZ8@xps13>
References: <1706989.WgznurFLZ8@xps13>
Cc: Eric Kinzie <ekinzie@brocade.com>
Subject: [dpdk-dev] [PATCH] mk: fix ABI versioning compile error for
	combined shared library
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Nov 2015 23:17:28 -0000

Fixes following error:
  LD libdpdk.so
  /usr/bin/ld: /root/dpdk/build/lib/libdpdk.so: version node not found
  for symbol <function>@DPDK_x.y

Defines version symbols in a fixed path libdpdk.map file and this
value hardcoded into makefile

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/libdpdk.map    | 12 ++++++++++++
 mk/rte.sharelib.mk |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 lib/libdpdk.map

diff --git a/lib/libdpdk.map b/lib/libdpdk.map
new file mode 100644
index 0000000..3988a3f
--- /dev/null
+++ b/lib/libdpdk.map
@@ -0,0 +1,12 @@
+DPDK_2.0 {
+
+};
+
+DPDK_2.1 {
+
+} DPDK_2.0;
+
+DPDK_2.2 {
+
+} DPDK_2.1;
+
diff --git a/mk/rte.sharelib.mk b/mk/rte.sharelib.mk
index 7bb7219..e206ce1 100644
--- a/mk/rte.sharelib.mk
+++ b/mk/rte.sharelib.mk
@@ -40,6 +40,7 @@ LIB_ONE := lib$(RTE_LIBNAME).so
 else
 LIB_ONE := lib$(RTE_LIBNAME).a
 endif
+SHARED_LDFLAGS += --version-script=./lib/libdpdk.map
 endif
 
 .PHONY:sharelib
@@ -50,10 +51,10 @@ OBJS = $(wildcard $(RTE_OUTPUT)/build/lib/*.o)
 ifeq ($(LINK_USING_CC),1)
 # Override the definition of LD here, since we're linking with CC
 LD := $(CC) $(CPU_CFLAGS)
-O_TO_S = $(LD) $(call linkerprefix,$(CPU_LDFLAGS)) \
+O_TO_S = $(LD) $(call linkerprefix,$(SHARED_LDFLAGS)) \
 	-shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)
 else
-O_TO_S = $(LD) $(CPU_LDFLAGS) \
+O_TO_S = $(LD) $(SHARED_LDFLAGS) \
 	-shared $(OBJS) -o $(RTE_OUTPUT)/lib/$(LIB_ONE)
 endif
 
-- 
1.9.3