[dpdk-dev] scripts: fix libnuma dependency in build test

Message ID 1468338912-4726-1-git-send-email-thomas.monjalon@6wind.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

Thomas Monjalon July 12, 2016, 3:55 p.m. UTC
  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 <thomas.monjalon@6wind.com>
---
 scripts/test-build.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
  

Comments

Thomas Monjalon July 15, 2016, 3:20 p.m. UTC | #1
2016-07-12 17:55, Thomas Monjalon:
> 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 <thomas.monjalon@6wind.com>

Applied
  

Patch

diff --git a/scripts/test-build.sh b/scripts/test-build.sh
index 5bcecfc..0c7a56b 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])
@@ -118,6 +119,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
@@ -154,7 +156,7 @@  config () # <directory> <target> <options>
 		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