From c3ce2ad3548c034e00906e312453909914e6fb1a Mon Sep 17 00:00:00 2001 From: Cyril Chemparathy Date: Thu, 9 Jul 2015 16:25:13 +0800 Subject: [PATCH] config: remove combined library name option The library name is now being pinned to "dpdk" instead of intel_dpdk, powerpc_dpdk, etc. As a result, we no longer need this config item. This patch removes it. Signed-off-by: Cyril Chemparathy Signed-off-by: Zhigang Lu Acked-by: Bruce Richardson --- config/common_bsdapp | 1 - config/common_linuxapp | 1 - config/defconfig_ppc_64-power8-linuxapp-gcc | 2 -- mk/rte.vars.mk | 5 +---- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index dfa61a323d..7112f1caef 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -87,7 +87,6 @@ CONFIG_RTE_BUILD_SHARED_LIB=n # Combine to one single library # CONFIG_RTE_BUILD_COMBINE_LIBS=n -CONFIG_RTE_LIBNAME=intel_dpdk # # Use newest code breaking previous ABI diff --git a/config/common_linuxapp b/config/common_linuxapp index f106d05d45..4d90d35844 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -87,7 +87,6 @@ CONFIG_RTE_BUILD_SHARED_LIB=n # Combine to one single library # CONFIG_RTE_BUILD_COMBINE_LIBS=n -CONFIG_RTE_LIBNAME="intel_dpdk" # # Use newest code breaking previous ABI diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc index d97a885443..f1af51842e 100644 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc @@ -39,8 +39,6 @@ CONFIG_RTE_ARCH_64=y CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y -CONFIG_RTE_LIBNAME="powerpc_dpdk" - # Note: Power doesn't have this support CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=n diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk index 0469064d33..f87cf4b042 100644 --- a/mk/rte.vars.mk +++ b/mk/rte.vars.mk @@ -65,10 +65,7 @@ ifneq ($(BUILDING_RTE_SDK),) RTE_SDK_BIN := $(RTE_OUTPUT) endif -RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%) -ifeq ($(RTE_LIBNAME),) -RTE_LIBNAME := intel_dpdk -endif +RTE_LIBNAME := dpdk # RTE_TARGET is deducted from config when we are building the SDK. # Else, when building an external app, RTE_TARGET must be specified -- 2.20.1