d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: simplify subdirectory detection for EAL

Browse Source 
Within EAL we had a series of if statements for selecting the EAL directory
to use. Now that the directory names match those of the OS's they are for
we can instead just use a generated subdirectory name, shortening the code.
To avoid strange errors, we still need to check for unsupported OS's, but
do this check up-front in the config meson.build file.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Luca Boccassi <bluca@debian.org>
This commit is contained in:
Bruce Richardson 2019-04-09 11:55:35 +01:00 committed by Thomas Monjalon
parent c039a73fc6
commit b458c2927a
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/meson.build
View File

@ -1,6 +1,13 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
# check the OS is supported, rather than going any further
supported_exec_envs = ['freebsd', 'linux', 'windows']
exec_env = host_machine.system()
if not supported_exec_envs.contains(exec_env)
error('unsupported system type "@0@"'.format(exec_env))
endif
# set the major version, which might be used by drivers and libraries
# depending on the configuration options
pver = meson.project_version().split('.')

17
lib/librte_eal/meson.build
View File

@ -9,21 +9,8 @@ subdir('common') # defines common_sources, common_objs, etc.
# Now do OS/exec-env specific settings, including building kernel modules
# The <exec-env>/eal/meson.build file should define env_sources, etc.
if host_machine.system() == 'linux'
dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1)
subdir('linux/eal')
elif host_machine.system() == 'freebsd'
dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1)
subdir('freebsd/eal')
elif host_machine.system() == 'windows'
dpdk_conf.set('RTE_EXEC_ENV_WINDOWS', 1)
subdir('windows/eal')
else
error('unsupported system type "@0@"'.format(host_machine.system()))
endif
dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
subdir(exec_env + '/eal')
version = 10 # the version of the EAL API
allow_experimental_apis = true