summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAndrew G. Harvey <agh@cisco.com>2015-12-07 13:48:57 +0000
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-12-08 02:59:54 +0100
commitd90f09dbc748563b9fbbeff2a94d86f772a06e29 (patch)
tree47e4330455e8f76d7b718df791a6781aabfa4b19 /mk
parent51202a208b5ebc6b6959b5aa884744e7957b9134 (diff)
downloaddpdk-d90f09dbc748563b9fbbeff2a94d86f772a06e29.zip
dpdk-d90f09dbc748563b9fbbeff2a94d86f772a06e29.tar.gz
dpdk-d90f09dbc748563b9fbbeff2a94d86f772a06e29.tar.xz
mk: remove ABI versioning for external library
Signed-off-by: Andrew G. Harvey <agh@cisco.com> Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/rte.extlib.mk2
-rw-r--r--mk/rte.lib.mk6
2 files changed, 7 insertions, 1 deletions
diff --git a/mk/rte.extlib.mk b/mk/rte.extlib.mk
index ba066bc..f58d96c 100644
--- a/mk/rte.extlib.mk
+++ b/mk/rte.extlib.mk
@@ -31,6 +31,8 @@
MAKEFLAGS += --no-print-directory
+EXTLIB_BUILD := y
+
# 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..3f026bf 100644
--- a/mk/rte.lib.mk
+++ b/mk/rte.lib.mk
@@ -35,16 +35,20 @@ include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
include $(RTE_SDK)/mk/internal/rte.build-pre.mk
include $(RTE_SDK)/mk/internal/rte.depdirs-pre.mk
+EXTLIB_BUILD ?= n
+
# VPATH contains at least SRCDIR
VPATH += $(SRCDIR)
ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB))
+ifeq ($(EXTLIB_BUILD),n)
ifeq ($(CONFIG_RTE_NEXT_ABI),y)
LIB := $(LIB).1
endif
CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP)
endif
+endif
_BUILD = $(LIB)
@@ -175,7 +179,7 @@ $(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)
-ifeq ($(CONFIG_RTE_NEXT_ABI),y)
+ifeq ($(CONFIG_RTE_NEXT_ABI)$(EXTLIB_BUILD),yn)
$(Q)ln -s -f $< $(basename $(basename $@))
else
$(Q)ln -s -f $< $(basename $@)