From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 0B65BC388 for ; Thu, 23 Jul 2015 17:01:15 +0200 (CEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga102.jf.intel.com with ESMTP; 23 Jul 2015 08:01:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,531,1432623600"; d="scan'208";a="611546354" Received: from lwang14-mobl6.amr.corp.intel.com ([10.127.184.110]) by orsmga003.jf.intel.com with ESMTP; 23 Jul 2015 08:01:11 -0700 From: Liang-Min Larry Wang To: dev@dpdk.org Date: Thu, 23 Jul 2015 11:00:27 -0400 Message-Id: <1437663628-18076-2-git-send-email-liang-min.wang@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437663628-18076-1-git-send-email-liang-min.wang@intel.com> References: <1437401571-9104-2-git-send-email-liang-min.wang@intel.com> <1437663628-18076-1-git-send-email-liang-min.wang@intel.com> Subject: [dpdk-dev] [PATCH v2 1/2] Remove ABI requierment for external library builds. X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jul 2015 15:01:16 -0000 From: "Andrew G. Harvey" Signed-off-by: Andrew G. Harvey --- mk/rte.extlib.mk | 2 ++ mk/rte.lib.mk | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk index ba066bc..d2a9b6d 100644 --- a/mk/rte.extlib.mk +++ b/mk/rte.extlib.mk @@ -31,6 +31,8 @@ MAKEFLAGS += --no-print-directory +export EXTLIB_BUILD := 1 + # we must create the output dir first and recall the same Makefile # from this directory ifeq ($(NOT_FIRST_CALL),) diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk index 9ff5cce..63ca640 100644 --- a/mk/rte.lib.mk +++ b/mk/rte.lib.mk @@ -40,11 +40,13 @@ VPATH += $(SRCDIR) ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) +ifndef EXTLIB_BUILD ifeq ($(CONFIG_RTE_NEXT_ABI),y) LIB := $(LIB).1 endif CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) endif +endif _BUILD = $(LIB) @@ -173,12 +175,16 @@ $(RTE_OUTPUT)/lib/$(LIB): $(LIB) @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) +ifdef EXTLIB_BUILD + $(Q)ln -s -f $< $(basename $@) +else ifeq ($(CONFIG_RTE_NEXT_ABI),y) $(Q)ln -s -f $< $(basename $(basename $@)) else $(Q)ln -s -f $< $(basename $@) endif endif +endif # # Clean all generated files -- 2.1.4