From a6742a3d88e7b10a8e241b21e724e4aa20c0025f Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 11 Jul 2016 23:26:01 +0200 Subject: [PATCH] scripts: fix libnuma dependency in build test The option CONFIG_RTE_LIBRTE_VHOST_NUMA depends on availability of libnuma in the system. The configuration option DPDK_DEP_NUMA can be set if available for the DPDK_TARGET being built. Fixes: cd31ca579c0d ("scripts: add build tests") Signed-off-by: Thomas Monjalon --- scripts/test-build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/test-build.sh b/scripts/test-build.sh index 52c89cf701..f9748d37b6 100755 --- a/scripts/test-build.sh +++ b/scripts/test-build.sh @@ -39,6 +39,7 @@ default_path=$PATH # - DPDK_DEP_CFLAGS # - DPDK_DEP_LDFLAGS # - DPDK_DEP_MOFED (y/[n]) +# - DPDK_DEP_NUMA (y/[n]) # - DPDK_DEP_PCAP (y/[n]) # - DPDK_DEP_SSL (y/[n]) # - DPDK_DEP_SZE (y/[n]) @@ -119,6 +120,7 @@ reset_env () unset DPDK_DEP_CFLAGS unset DPDK_DEP_LDFLAGS unset DPDK_DEP_MOFED + unset DPDK_DEP_NUMA unset DPDK_DEP_PCAP unset DPDK_DEP_SSL unset DPDK_DEP_SZE @@ -155,7 +157,7 @@ config () # sed -ri 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config ) # Automatic configuration - ! echo $2 | grep -q '^x86_64' || \ + test "$DPDK_DEP_NUMA" != y || \ sed -ri 's,(NUMA=)n,\1y,' $1/.config sed -ri 's,(PCI_CONFIG=)n,\1y,' $1/.config sed -ri 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config -- 2.20.1