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

diff --git a/buildtools/meson.build b/buildtools/meson.build
index 8d0b9e0cd0..e1c600e40f 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -1,16 +1,54 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017-2019 Intel Corporation
 
-subdir('pmdinfogen')
+pkgconf = find_program('pkg-config', 'pkgconf', required: false)
+check_symbols = find_program('check-symbols.sh')
+ldflags_ibverbs_static = find_program('options-ibverbs-static.sh')
+objdump = find_program('objdump', 'llvm-objdump')
 
-pmdinfo = find_program('gen-pmdinfo-cfile.sh')
-
-check_experimental_syms = find_program('check-experimental-syms.sh')
-
-# set up map-to-def script using python, either built-in or external
 python3 = import('python').find_installation(required: false)
 if python3.found()
-	map_to_def_cmd = [python3, files('map_to_def.py')]
+    py3 = [python3]
 else
-	map_to_def_cmd = ['meson', 'runpython', files('map_to_def.py')]
+    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()]
+pmdinfogen = py3 + files('pmdinfogen.py')
+if host_machine.system() == 'windows'
+    if cc.get_id() == 'gcc'
+        pmdinfo += 'ar'
+    else
+        pmdinfo += 'llvm-ar'
+    endif
+    pmdinfogen += 'coff'
+elif host_machine.system() == 'freebsd'
+    pmdinfo += 'llvm-ar'
+    pmdinfogen += 'elf'
+else
+    pmdinfo += 'ar'
+    pmdinfogen += 'elf'
+endif
+
+# TODO: starting from Meson 0.51.0 use
+#     python3 = import('python').find_installation('python',
+#        modules : python3_required_modules)
+python3_required_modules = []
+if host_machine.system() != 'windows'
+    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), check: false).returncode() != 0
+        error('missing python module: @0@'.format(module))
+    endif
+endforeach