X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=buildtools%2Fmeson.build;h=f776316da1cd131bb551289cea6c5da173ba2cd5;hb=25829b55b463f7bb0b69af0e63b19121a16d2a63;hp=0f563d89a3f72950070b93227eda4752a03ee99f;hpb=ab9407c3addde1eee0f93e7c3491536cd4db4369;p=dpdk.git

diff --git a/buildtools/meson.build b/buildtools/meson.build
index 0f563d89a3..f776316da1 100644
--- a/buildtools/meson.build
+++ b/buildtools/meson.build
@@ -1,21 +1,49 @@
 # 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')
+binutils_avx512_check = find_program('binutils-avx512-check.sh')
 
-pmdinfo = find_program('gen-pmdinfo-cfile.sh')
-list_dir_globs = find_program('list-dir-globs.py')
-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()
-	py3 = [python3]
+    py3 = [python3]
 else
-	py3 = ['meson', 'runpython']
+    py3 = ['meson', 'runpython']
 endif
-map_to_def_cmd = py3 + files('map_to_def.py')
+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')
 
-# stable ABI always starts with "DPDK_"
-is_experimental_cmd = [find_program('grep', 'findstr'), '^DPDK_']
+# 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'
+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)).returncode() != 0
+        error('missing python module: @0@'.format(module))
+    endif
+endforeach