From 100e8427b62fbb438c6ef35bae1fc9ce5f79289c Mon Sep 17 00:00:00 2001 From: Dariusz Stojaczyk Date: Fri, 15 Jun 2018 14:48:32 +0200 Subject: [PATCH] env.mk: link libnuma if RTE_EAL_NUMA_AWARE_HUGEPAGES is set We used to check RTE_LIBRTE_VHOST_NUMA to decide whether or not libnuma should be linked, but EAL may need it as well. With our DPDK 18.02 fork we build fine just because RTE_LIBRTE_VHOST_NUMA is always set Change-Id: I2bdf03b328d3ae074437565c8b66e2b6adcbfe89 Signed-off-by: Dariusz Stojaczyk Reviewed-on: https://review.gerrithub.io/415481 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- lib/env_dpdk/env.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/env_dpdk/env.mk b/lib/env_dpdk/env.mk index 12b10d199..a4fa95b83 100644 --- a/lib/env_dpdk/env.mk +++ b/lib/env_dpdk/env.mk @@ -88,7 +88,7 @@ ENV_LIBS = $(ENV_DPDK_FILE) $(DPDK_LIB) ENV_LINKER_ARGS = $(ENV_DPDK_FILE) -Wl,--start-group -Wl,--whole-archive $(DPDK_LIB) -Wl,--end-group -Wl,--no-whole-archive ifneq (,$(wildcard $(DPDK_INC_DIR)/rte_config.h)) -ifneq (,$(shell grep "define RTE_LIBRTE_VHOST_NUMA 1" $(DPDK_INC_DIR)/rte_config.h)) +ifneq (,$(shell grep -e "define RTE_LIBRTE_VHOST_NUMA 1" -e "define RTE_EAL_NUMA_AWARE_HUGEPAGES 1" $(DPDK_INC_DIR)/rte_config.h)) ENV_LINKER_ARGS += -lnuma endif endif