summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2016-07-06 16:33:01 +0200
committerThomas Monjalon <thomas.monjalon@6wind.com>2016-07-10 16:23:13 +0200
commitc6946933310be6172b8a64017711dd8f2361bc2f (patch)
treeda6d92d70deedae742073db12e58d25ed3e9efd7 /examples
parentd7a4bb154913e9ac3e3c5801728150bb025643c4 (diff)
downloaddpdk-c6946933310be6172b8a64017711dd8f2361bc2f.zip
dpdk-c6946933310be6172b8a64017711dd8f2361bc2f.tar.gz
dpdk-c6946933310be6172b8a64017711dd8f2361bc2f.tar.xz
examples: fix dependencies on hash library
The multi_process example do not need rte_hash. But these examples cannot compile if rte_hash is not available: - ipsec-secgw (was already protected - no change) - ipv4_multicast - l3fwd-power - l3fwd-vf - tep_termination - ip_pipeline The ip_pipeline example is not disabled because its dependencies are handled with #ifdef. It may require a separate fix. Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile8
-rw-r--r--examples/multi_process/client_server_mp/mp_server/init.c1
-rw-r--r--examples/multi_process/client_server_mp/mp_server/main.c1
3 files changed, 6 insertions, 4 deletions
diff --git a/examples/Makefile b/examples/Makefile
index f650d3e..18b41b9 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -54,7 +54,7 @@ endif
ifeq ($(CONFIG_RTE_LIBRTE_ACL)$(CONFIG_RTE_LIBRTE_HASH)$(CONFIG_RTE_LIBRTE_LPM),yyy)
DIRS-$(CONFIG_RTE_LIBRTE_CRYPTODEV) += ipsec-secgw
endif
-DIRS-y += ipv4_multicast
+DIRS-$(CONFIG_RTE_LIBRTE_HASH) += ipv4_multicast
DIRS-$(CONFIG_RTE_LIBRTE_KNI) += kni
DIRS-y += l2fwd
ifneq ($(PQOS_INSTALL_PATH),)
@@ -65,9 +65,11 @@ DIRS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += l2fwd-ivshmem
DIRS-$(CONFIG_RTE_LIBRTE_JOBSTATS) += l2fwd-jobstats
DIRS-y += l2fwd-keepalive
DIRS-y += l2fwd-keepalive/ka-agent
+ifeq ($(CONFIG_RTE_LIBRTE_HASH),y)
DIRS-$(CONFIG_RTE_LIBRTE_LPM) += l3fwd
+endif
DIRS-$(CONFIG_RTE_LIBRTE_ACL) += l3fwd-acl
-ifeq ($(CONFIG_RTE_LIBRTE_LPM),y)
+ifeq ($(CONFIG_RTE_LIBRTE_LPM)$(CONFIG_RTE_LIBRTE_HASH),yy)
DIRS-$(CONFIG_RTE_LIBRTE_POWER) += l3fwd-power
DIRS-y += l3fwd-vf
endif
@@ -82,7 +84,9 @@ DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += qos_sched
DIRS-y += quota_watermark
DIRS-$(CONFIG_RTE_ETHDEV_RXTX_CALLBACKS) += rxtx_callbacks
DIRS-y += skeleton
+ifeq ($(CONFIG_RTE_LIBRTE_HASH),y)
DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += tep_termination
+endif
DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += timer
DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost
DIRS-$(CONFIG_RTE_LIBRTE_XEN_DOM0) += vhost_xen
diff --git a/examples/multi_process/client_server_mp/mp_server/init.c b/examples/multi_process/client_server_mp/mp_server/init.c
index ecb61c6..ad941a7 100644
--- a/examples/multi_process/client_server_mp/mp_server/init.c
+++ b/examples/multi_process/client_server_mp/mp_server/init.c
@@ -60,7 +60,6 @@
#include <rte_ether.h>
#include <rte_ethdev.h>
#include <rte_malloc.h>
-#include <rte_fbk_hash.h>
#include <rte_string_fns.h>
#include <rte_cycles.h>
diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c
index de54c67..a6dc12d 100644
--- a/examples/multi_process/client_server_mp/mp_server/main.c
+++ b/examples/multi_process/client_server_mp/mp_server/main.c
@@ -65,7 +65,6 @@
#include <rte_ethdev.h>
#include <rte_byteorder.h>
#include <rte_malloc.h>
-#include <rte_fbk_hash.h>
#include <rte_string_fns.h>
#include "common.h"