X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=buildtools%2Fmeson.build;h=e1c600e40f9953db7c1c9dfbac864f890277952d;hb=013b4c52c708dc8fed079ff05fbe66f475365586;hp=0f24b15297a87d1fec0dfd215b143ee644cbb32c;hpb=627c5b41bb14a1afbd1489b0fc4b8224532a823d;p=dpdk.git

diff --git a/buildtools/meson.build b/buildtools/meson.build
index 0f24b15297..e1c600e40f 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -4,18 +4,22 @@
 pkgconf = find_program('pkg-config', 'pkgconf', required: false)
 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')
+objdump = find_program('objdump', 'llvm-objdump')
 
-# 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]
 else
     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')
+binutils_avx512_check = (py3 + files('binutils-avx512-check.py') +
+                        [objdump] + cc.cmd_array())
 
 # select library and object file format
 pmdinfo = py3 + files('gen-pmdinfo-cfile.py') + [meson.current_build_dir()]
@@ -27,6 +31,9 @@ if host_machine.system() == 'windows'
         pmdinfo += 'llvm-ar'
     endif
     pmdinfogen += 'coff'
+elif host_machine.system() == 'freebsd'
+    pmdinfo += 'llvm-ar'
+    pmdinfogen += 'elf'
 else
     pmdinfo += 'ar'
     pmdinfogen += 'elf'
@@ -41,7 +48,7 @@ if host_machine.system() != 'windows'
 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
+    if run_command(py3, '-c', script.format(module), check: false).returncode() != 0
         error('missing python module: @0@'.format(module))
     endif
 endforeach