ec2b8cd7ed
The problem occurred when workaround that makes soname two digits
applied. With this change for the ABI version "20.0.1" the experimental
library version become ".so.2001".
After workaround removed in ABI version 21.0, the experimental library
version will become ".so.210".
"2001" is bigger value than "201" although it is a previous version of
the library version, this can break the version comparisons.
To fix this, introducing a temporary sub level versioning for the
experimental libraries, so that minor version comparison will continue
to work.
After change experimental libraries will follow below versioning:
DPDK version ABI version soname library name
------------ ----------- ------ ------------
DPDK 19.11 20.0 .so.0.200 .so.0.200
DPDK 20.02 20.0.1 .so.0.200.1 .so.0.200.1
DPDK 20.05 20.0.2 .so.0.200.2 .so.0.200.2
DPDK 20.11 21.0 .so.0.210 .so.0.210
DPDK 21.02 21.1 .so.0.211 .so.0.211
Note: After workaround removed in DPDK 20.11 and soname switch back to
single digit this patch won't work and needs to be updated.
Fixes: f26c2b39b2 ("build: fix soname info for 19.11 compatibility")
Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
Acked-by: Ray Kinsella <ray.kinsella@intel.com>
162 lines
4.5 KiB
Makefile
162 lines
4.5 KiB
Makefile
# SPDX-License-Identifier: BSD-3-Clause
|
|
# Copyright(c) 2010-2014 Intel Corporation
|
|
|
|
include $(RTE_SDK)/mk/internal/rte.compile-pre.mk
|
|
include $(RTE_SDK)/mk/internal/rte.install-pre.mk
|
|
include $(RTE_SDK)/mk/internal/rte.clean-pre.mk
|
|
include $(RTE_SDK)/mk/internal/rte.build-pre.mk
|
|
|
|
EXTLIB_BUILD ?= n
|
|
|
|
# VPATH contains at least SRCDIR
|
|
VPATH += $(SRCDIR)
|
|
|
|
LIBABIVER ?= $(shell cat $(RTE_SRCDIR)/ABI_VERSION)
|
|
SOVER := $(basename $(LIBABIVER))
|
|
ifeq ($(shell grep -s "^DPDK_" $(SRCDIR)/$(EXPORT_MAP)),)
|
|
# EXPERIMENTAL ABI is versioned as 0.major+minor, e.g. 0.201 for 20.1 ABI
|
|
LIBABIVER := 0.$(shell echo $(LIBABIVER) | awk 'BEGIN { FS="." }; { print $$1$$2"."$$3 }')
|
|
SOVER := $(LIBABIVER)
|
|
endif
|
|
|
|
ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
|
|
SONAME := $(patsubst %.a,%.so.$(SOVER),$(LIB))
|
|
LIB := $(patsubst %.a,%.so.$(LIBABIVER),$(LIB))
|
|
ifeq ($(EXTLIB_BUILD),n)
|
|
CPU_LDFLAGS += --version-script=$(SRCDIR)/$(EXPORT_MAP)
|
|
endif
|
|
endif
|
|
|
|
|
|
_BUILD = $(LIB)
|
|
PREINSTALL = $(SYMLINK-FILES-y)
|
|
_INSTALL = $(INSTALL-FILES-y) $(RTE_OUTPUT)/lib/$(LIB)
|
|
_CLEAN = doclean
|
|
|
|
LDLIBS += $(EXECENV_LDLIBS-y)
|
|
|
|
.PHONY: all
|
|
all: install
|
|
|
|
.PHONY: install
|
|
ifeq ($(SYMLINK-FILES-y),)
|
|
install: build _postinstall
|
|
else
|
|
install: _preinstall build _postinstall
|
|
build: _preinstall
|
|
endif
|
|
|
|
_postinstall: build
|
|
|
|
.PHONY: build
|
|
build: _postbuild
|
|
|
|
exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1))))
|
|
|
|
ifeq ($(LINK_USING_CC),1)
|
|
# Override the definition of LD here, since we're linking with CC
|
|
LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS)
|
|
_CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS))
|
|
override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS))
|
|
else
|
|
_CPU_LDFLAGS := $(CPU_LDFLAGS)
|
|
endif
|
|
|
|
O_TO_A = $(AR) crDs $(LIB) $(OBJS-y)
|
|
O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight
|
|
O_TO_A_DISP = $(if $(V),"$(O_TO_A_STR)"," AR $(@)")
|
|
O_TO_A_CMD = "cmd_$@ = $(O_TO_A_STR)"
|
|
O_TO_A_DO = @set -e; \
|
|
echo $(O_TO_A_DISP); \
|
|
$(O_TO_A) && \
|
|
echo $(O_TO_A_CMD) > $(call exe2cmd,$(@))
|
|
|
|
ifneq ($(CC_SUPPORTS_Z),false)
|
|
NO_UNDEFINED := -z defs
|
|
endif
|
|
|
|
O_TO_S = $(LD) -L$(RTE_SDK_BIN)/lib $(_CPU_LDFLAGS) $(EXTRA_LDFLAGS) \
|
|
-shared $(OBJS-y) $(NO_UNDEFINED) $(LDLIBS) -Wl,-soname,$(SONAME) -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; \
|
|
echo $(O_TO_S_DISP); \
|
|
$(O_TO_S) && \
|
|
echo $(O_TO_S_CMD) > $(call exe2cmd,$(@))
|
|
|
|
-include .$(LIB).cmd
|
|
|
|
#
|
|
# Archive objects in .a file if needed
|
|
#
|
|
ifeq ($(CONFIG_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 "$< -> $@ " ; \
|
|
echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
|
|
echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_S_STR))) " ; \
|
|
echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
|
|
echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
|
|
$(if $(or \
|
|
$(file_missing),\
|
|
$(call cmdline_changed,$(O_TO_S_STR)),\
|
|
$(depfile_missing),\
|
|
$(depfile_newer)),\
|
|
$(O_TO_S_DO))
|
|
|
|
else
|
|
$(LIB): $(OBJS-y) $(DEP_$(LIB)) FORCE
|
|
@[ -d $(dir $@) ] || mkdir -p $(dir $@)
|
|
$(if $(D),\
|
|
@echo -n "$< -> $@ " ; \
|
|
echo -n "file_missing=$(call boolean,$(file_missing)) " ; \
|
|
echo -n "cmdline_changed=$(call boolean,$(call cmdline_changed,$(O_TO_A_STR))) " ; \
|
|
echo -n "depfile_missing=$(call boolean,$(depfile_missing)) " ; \
|
|
echo "depfile_newer=$(call boolean,$(depfile_newer)) ")
|
|
$(if $(or \
|
|
$(file_missing),\
|
|
$(call cmdline_changed,$(O_TO_A_STR)),\
|
|
$(depfile_missing),\
|
|
$(depfile_newer)),\
|
|
$(O_TO_A_DO))
|
|
endif
|
|
|
|
#
|
|
# install lib in $(RTE_OUTPUT)/lib
|
|
#
|
|
$(RTE_OUTPUT)/lib/$(LIB): $(LIB)
|
|
@echo " INSTALL-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)
|
|
$(Q)ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so/')
|
|
$(Q)if [ $(SOVER) != $(LIBABIVER) ]; then \
|
|
ln -s -f $< $(shell echo $@ | sed 's/\.so.*/.so.$(SOVER)/') ; \
|
|
fi
|
|
endif
|
|
|
|
#
|
|
# Clean all generated files
|
|
#
|
|
.PHONY: clean
|
|
clean: _postclean
|
|
|
|
.PHONY: doclean
|
|
doclean:
|
|
$(Q)rm -rf $(LIB) $(OBJS-all) $(DEPS-all) $(DEPSTMP-all) \
|
|
$(CMDS-all) .$(LIB).cmd $(INSTALL-FILES-all) *.pmd.c *.pmd.o
|
|
$(Q)rm -f $(_BUILD_TARGETS) $(_INSTALL_TARGETS) $(_CLEAN_TARGETS)
|
|
|
|
include $(RTE_SDK)/mk/internal/rte.compile-post.mk
|
|
include $(RTE_SDK)/mk/internal/rte.install-post.mk
|
|
include $(RTE_SDK)/mk/internal/rte.clean-post.mk
|
|
include $(RTE_SDK)/mk/internal/rte.build-post.mk
|
|
|
|
.PHONY: FORCE
|
|
FORCE:
|