From f111b320f0fbd0e6862dc578b8b353411bb3ecc3 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Fri, 3 Dec 2021 10:43:58 +0100 Subject: [PATCH] lib/env_dpdk: remove duplicate entries from DPDK_LIB_LIST Future patches will remove some of the more complex conditions between different configure flags. As a result duplicate entries might be present in DPDK_LIB_LIST. Just for tidiness of the DPDK linker args, the DPDK_LIB_LIST_SORTED is added. Using sort function removes duplicate entries in the list. Signed-off-by: Tomasz Zawadzki Change-Id: I318fd0cebbd30a80d281175b7d48bb3249abb841 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10537 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Changpeng Liu Reviewed-by: Dong Yi --- lib/env_dpdk/env.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index c82c5b1d6..36257fb03 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -122,8 +122,10 @@ DPDK_LIB_LIST += rte_rcu endif endif -DPDK_SHARED_LIB = $(DPDK_LIB_LIST:%=$(DPDK_LIB_DIR)/lib%.so) -DPDK_STATIC_LIB = $(DPDK_LIB_LIST:%=$(DPDK_LIB_DIR)/lib%.a) +DPDK_LIB_LIST_SORTED = $(sort $(DPDK_LIB_LIST)) + +DPDK_SHARED_LIB = $(DPDK_LIB_LIST_SORTED:%=$(DPDK_LIB_DIR)/lib%.so) +DPDK_STATIC_LIB = $(DPDK_LIB_LIST_SORTED:%=$(DPDK_LIB_DIR)/lib%.a) DPDK_SHARED_LIB_LINKER_ARGS = $(call add_no_as_needed,$(DPDK_SHARED_LIB)) DPDK_STATIC_LIB_LINKER_ARGS = $(call add_whole_archive,$(DPDK_STATIC_LIB))