X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=mk%2Frte.lib.mk;h=0d7482d4ffd33f8f947b7b08dc4674ed1a2c2ecc;hb=f161fb6ad5125e8286ea6aaa01e8903dacf21161;hp=1d3b64628b8bfe48a6b08dd8fc35dd2bf0ddfbc2;hpb=166a743c53fa6cde255c5e0e3bb34d4a7c54d0bf;p=dpdk.git diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk index 1d3b64628b..0d7482d4ff 100644 --- a/mk/rte.lib.mk +++ b/mk/rte.lib.mk @@ -37,10 +37,9 @@ include $(RTE_SDK)/mk/internal/rte.depdirs-pre.mk # VPATH contains at least SRCDIR VPATH += $(SRCDIR) - ifeq ($(RTE_BUILD_SHARED_LIB),y) -LIB := $(patsubst %.a,%.so,$(LIB)) +LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB)) CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP) endif @@ -80,7 +79,7 @@ O_TO_A_DO = @set -e; \ $(O_TO_A) && \ echo $(O_TO_A_CMD) > $(call exe2cmd,$(@)) -O_TO_S = $(LD) $(_CPU_LDFLAGS) -shared $(OBJS-y) -o $(LIB) +O_TO_S = $(LD) $(_CPU_LDFLAGS) -shared $(OBJS-y) -Wl,-soname,$(LIB) -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; \ @@ -113,6 +112,10 @@ lib_dir = [ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib; # ifeq ($(RTE_BUILD_SHARED_LIB),y) $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE +ifeq ($(LIBABIVER),) + @echo "Must Specify a $(LIB) ABI version" + @false +endif @[ -d $(dir $@) ] || mkdir -p $(dir $@) $(if $(D),\ @echo -n "$< -> $@ " ; \ @@ -126,6 +129,7 @@ $(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE $(depfile_missing),\ $(depfile_newer)),\ $(O_TO_S_DO)) + ifeq ($(RTE_BUILD_COMBINE_LIBS),y) $(if $(or \ $(file_missing),\ @@ -163,9 +167,13 @@ endif # install lib in $(RTE_OUTPUT)/lib # $(RTE_OUTPUT)/lib/$(LIB): $(LIB) + $(eval LIBSONAME := $(basename $(LIB))) @echo " INSTALL-LIB $(LIB)" @[ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib $(Q)cp -f $(LIB) $(RTE_OUTPUT)/lib +ifeq ($(RTE_BUILD_SHARED_LIB),y) + $(Q)ln -s -f $< $(RTE_OUTPUT)/lib/$(LIBSONAME) +endif # # Clean all generated files