X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=buildtools%2Fmeson.build;h=f776316da1cd131bb551289cea6c5da173ba2cd5;hb=8b51fbc09e44ceaca0d32139bbc558d8cd5d06dd;hp=0a2e91a7b9488906e6f3f0a4d7ce55a52493c89d;hpb=e6e9730c7066246856546563c0f5dcf5be10372d;p=dpdk.git

diff --git a/buildtools/meson.build b/buildtools/meson.build
index 0a2e91a7b9..f776316da1 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -2,46 +2,48 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 pkgconf = find_program('pkg-config', 'pkgconf', required: false)
-list_dir_globs = find_program('list-dir-globs.py')
 check_symbols = find_program('check-symbols.sh')
 ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
 binutils_avx512_check = find_program('binutils-avx512-check.sh')
 
-# set up map-to-win script using python, either built-in or external
 python3 = import('python').find_installation(required: false)
 if python3.found()
-	py3 = [python3]
+    py3 = [python3]
 else
-	py3 = ['meson', 'runpython']
+    py3 = ['meson', 'runpython']
 endif
+echo = py3 + ['-c', 'import sys; print(*sys.argv[1:])']
+list_dir_globs = py3 + files('list-dir-globs.py')
 map_to_win_cmd = py3 + files('map_to_win.py')
 sphinx_wrapper = py3 + files('call-sphinx-build.py')
+get_cpu_count_cmd = py3 + files('get-cpu-count.py')
+get_numa_count_cmd = py3 + files('get-numa-count.py')
 
 # select library and object file format
-pmdinfo = py3 + files('gen-pmdinfo-cfile.py')
+pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
 pmdinfogen = py3 + files('pmdinfogen.py')
 if host_machine.system() == 'windows'
-	if cc.get_id() == 'gcc'
-		pmdinfo += 'ar'
-	else
-		pmdinfo += 'llvm-ar'
-	endif
-	pmdinfogen += 'coff'
+    if cc.get_id() == 'gcc'
+        pmdinfo += 'ar'
+    else
+        pmdinfo += 'llvm-ar'
+    endif
+    pmdinfogen += 'coff'
 else
-	pmdinfo += 'ar'
-	pmdinfogen += 'elf'
+    pmdinfo += 'ar'
+    pmdinfogen += 'elf'
 endif
 
 # TODO: starting from Meson 0.51.0 use
-# 	python3 = import('python').find_installation('python',
-#		modules : python3_required_modules)
+#     python3 = import('python').find_installation('python',
+#        modules : python3_required_modules)
 python3_required_modules = []
 if host_machine.system() != 'windows'
-	python3_required_modules = ['elftools']
+    python3_required_modules = ['elftools']
 endif
 foreach module : python3_required_modules
-	script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
-	if run_command(py3, '-c', script.format(module)).returncode() != 0
-		error('missing python module: @0@'.format(module))
-	endif
+    script = 'import importlib.util; import sys; exit(importlib.util.find_spec("@0@") is None)'
+    if run_command(py3, '-c', script.format(module)).returncode() != 0
+        error('missing python module: @0@'.format(module))
+    endif
 endforeach