From mboxrd@z Thu Jan 1 00:00:00 1970 From: Remy Horton Subject: [PATCH v10 1/4] Remove ABI requirement for external library builds. Date: Mon, 7 Dec 2015 13:48:57 +0000 Message-ID: <1449496140-11758-2-git-send-email-remy.horton@intel.com> References: <1449496140-11758-1-git-send-email-remy.horton@intel.com> To: dev@dpdk.org Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 05B8595B4 for ; Mon, 7 Dec 2015 14:49:03 +0100 (CET) In-Reply-To: <1449496140-11758-1-git-send-email-remy.horton@intel.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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..4d459e4 100644 --- a/mk/rte.extlib.mk +++ b/mk/rte.extlib.mk @@ -31,6 +31,8 @@ MAKEFLAGS += --no-print-directory +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 1f1b6e1..02734e3 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) @@ -175,12 +177,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 -- 1.9.3