summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-04-09 11:55:36 +0100
committerThomas Monjalon <thomas@monjalon.net>2019-04-17 18:09:52 +0200
commitadf93ca564c73183e1c705cd7f35b98f3a660228 (patch)
tree43da96af2eb274a918071d2931ddfdab1b87a390 /config
parentb458c2927ab416fd7becfbc740ccfa53f0dfbdd1 (diff)
downloaddpdk-draft-windows-adf93ca564c73183e1c705cd7f35b98f3a660228.zip
dpdk-draft-windows-adf93ca564c73183e1c705cd7f35b98f3a660228.tar.gz
dpdk-draft-windows-adf93ca564c73183e1c705cd7f35b98f3a660228.tar.xz
build: increase readability via shortcut variables
Define variables for "is_linux", "is_freebsd" and "is_windows" to make the code shorter for comparisons and more readable. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Reviewed-by: David Marchand <david.marchand@redhat.com> Acked-by: Luca Boccassi <bluca@debian.org>
Diffstat (limited to 'config')
-rw-r--r--config/meson.build14
-rw-r--r--config/x86/meson.build2
2 files changed, 11 insertions, 5 deletions
diff --git a/config/meson.build b/config/meson.build
index ce6af25..f8aded6 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -8,6 +8,12 @@ if not supported_exec_envs.contains(exec_env)
error('unsupported system type "@0@"'.format(exec_env))
endif
+# define a handy variable for checking which OS we have.
+# gives us "is_windows", "is_freebsd" and "is_linux"
+foreach env:supported_exec_envs
+ set_variable('is_' + env, exec_env == env)
+endforeach
+
# set the major version, which might be used by drivers and libraries
# depending on the configuration options
pver = meson.project_version().split('.')
@@ -95,9 +101,9 @@ if cc.find_library('libm', required : false).found()
endif
# for linux link against dl, for bsd execinfo
-if host_machine.system() == 'linux'
+if is_linux
link_lib = 'dl'
-elif host_machine.system() == 'freebsd'
+elif is_freebsd
link_lib = 'execinfo'
else
link_lib = ''
@@ -120,7 +126,7 @@ if numa_dep.found() and cc.has_header('numaif.h')
endif
# check for strlcpy
-if host_machine.system() == 'linux'
+if is_linux
libbsd = dependency('libbsd', required: false)
if libbsd.found()
dpdk_conf.set('RTE_USE_LIBBSD', 1)
@@ -175,4 +181,4 @@ dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
install_headers('rte_config.h', subdir: get_option('include_subdir_arch'))
# enable VFIO only if it is linux OS
-dpdk_conf.set('RTE_EAL_VFIO', host_machine.system() == 'linux')
+dpdk_conf.set('RTE_EAL_VFIO', is_linux)
diff --git a/config/x86/meson.build b/config/x86/meson.build
index 558edfd..2b2d062 100644
--- a/config/x86/meson.build
+++ b/config/x86/meson.build
@@ -5,7 +5,7 @@
march_opt = ['-march=@0@'.format(machine)]
# get binutils version for the workaround of Bug 97
-if host_machine.system() != 'windows'
+if not is_windows
ldver = run_command('ld', '-v').stdout().strip()
if ldver.contains('2.30')
if cc.has_argument('-mno-avx512f')