From 93e32ea3491f277af1caf675c2b0be3708bc00c3 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Thu, 30 Mar 2017 14:32:28 +0200 Subject: [PATCH] mk: fix dependencies to optional configs In rte.lib.mk, the list of libraries passed to the link command (LDLIBS) is generated from the DEPDIRS-xxx variables. If a library is not compiled because it is disabled in configuration, it should not appear in DEPDIRS-xxx. - librte_port depends on librte_kni only if it is enabled. - librte_table depends on librte_acl only if it is enabled. Fixes: feb9f680cd2c ("mk: optimize directory dependencies") Reported-by: Ferruh Yigit Signed-off-by: Olivier Matz Tested-by: Ferruh Yigit --- lib/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 5ad3c7cc43..531b16288d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -81,10 +81,16 @@ DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ether DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port DEPDIRS-librte_port := librte_eal librte_mempool librte_mbuf librte_ether -DEPDIRS-librte_port += librte_ip_frag librte_sched librte_kni +DEPDIRS-librte_port += librte_ip_frag librte_sched +ifeq ($(CONFIG_RTE_LIBRTE_KNI),y) +DEPDIRS-librte_port += librte_kni +endif DIRS-$(CONFIG_RTE_LIBRTE_TABLE) += librte_table DEPDIRS-librte_table := librte_eal librte_mempool librte_mbuf -DEPDIRS-librte_table += librte_port librte_lpm librte_acl librte_hash +DEPDIRS-librte_table += librte_port librte_lpm librte_hash +ifeq ($(CONFIG_RTE_LIBRTE_ACL),y) +DEPDIRS-librte_table += librte_acl +endif DIRS-$(CONFIG_RTE_LIBRTE_PIPELINE) += librte_pipeline DEPDIRS-librte_pipeline := librte_eal librte_mempool librte_mbuf DEPDIRS-librte_pipeline += librte_table librte_port -- 2.20.1