Commit 100e8427 authored Jun 15, 2018 by Dariusz Stojaczyk Committed by Jim Harris Jun 15, 2018

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 <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/415481


Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>

parent 9abd8bec

lib/env_dpdk/env.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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