DPDK patches and discussions
 help / color / mirror / Atom feed
From: Olivier Matz <olivier.matz@6wind.com>
To: dev@dpdk.org
Cc: thomas.monjalon@6wind.com, ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH] mk: fix dependencies to optional configs
Date: Thu, 30 Mar 2017 14:32:28 +0200	[thread overview]
Message-ID: <20170330123228.28567-1-olivier.matz@6wind.com> (raw)
In-Reply-To: <20170330141120.2dbefae4@platinum>

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 <ferruh.yigit@intel.com>
Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 456eb38a4..b2545ff70 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.11.0

  reply	other threads:[~2017-03-30 12:32 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-22  1:50 [dpdk-dev] [PATCH] mk: parallelize make config Ferruh Yigit
2017-01-23 17:18 ` Olivier Matz
2017-01-23 17:19   ` [dpdk-dev] [PATCH] mk: optimize directory dependencies Olivier Matz
2017-01-24 11:19     ` Robin Jarry
2017-01-24 11:26       ` Bruce Richardson
2017-01-24 12:31         ` Robin Jarry
2017-01-24 11:40     ` Jerin Jacob
2017-01-24 12:15       ` Bruce Richardson
2017-01-24 12:56         ` Jerin Jacob
2017-01-24 13:26           ` Richardson, Bruce
2017-01-24 14:50             ` Olivier MATZ
2017-01-24 14:55               ` Wiles, Keith
2017-03-01 11:25                 ` Thomas Monjalon
2017-03-01 12:10                   ` Bruce Richardson
2017-03-01 12:30                   ` Olivier Matz
2017-01-24 13:05     ` Ferruh Yigit
2017-03-17 17:13     ` Olivier Matz
2017-03-17 17:47       ` Robin Jarry
2017-03-20  8:31         ` Olivier Matz
2017-03-24 13:21       ` [dpdk-dev] [PATCH v2] " Olivier Matz
2017-03-27 21:33         ` Thomas Monjalon
2017-03-28 10:34         ` Ferruh Yigit
2017-03-30  8:51           ` Olivier Matz
2017-03-30  9:27             ` Ferruh Yigit
2017-03-30 12:11               ` Olivier Matz
2017-03-30 12:32                 ` Olivier Matz [this message]
2017-03-30 12:37                   ` [dpdk-dev] [PATCH] mk: fix dependencies to optional configs Ferruh Yigit
2017-03-30 13:37                     ` Thomas Monjalon
2017-01-23 17:50   ` [dpdk-dev] [PATCH] mk: parallelize make config Wiles, Keith
2017-01-24  8:42     ` Olivier MATZ
2017-01-24 10:02       ` Bruce Richardson
2017-01-23 19:03 ` Michał Mirosław
2017-01-30  9:41   ` Ferruh Yigit
2017-01-24 10:52 ` Bruce Richardson
2017-01-29 15:29 ` Thomas Monjalon
2017-01-30  9:46   ` Ferruh Yigit
2017-01-30 10:21 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit
2017-01-30 18:13   ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170330123228.28567-1-olivier.matz@6wind.com \
    --to=olivier.matz@6wind.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=thomas.monjalon@6wind.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).