git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: simplify subdirectory detection for EAL
[dpdk.git]
/
lib
/
librte_eal
/
meson.build
diff --git
a/lib/librte_eal/meson.build
b/lib/librte_eal/meson.build
index
e1fde15
..
fa36b20
100644
(file)
--- a/
lib/librte_eal/meson.build
+++ b/
lib/librte_eal/meson.build
@@
-1,5
+1,5
@@
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017
-2019
Intel Corporation
# Custom EAL processing. EAL is complicated enough that it can't just
# have a straight list of headers and source files.
# Custom EAL processing. EAL is complicated enough that it can't just
# have a straight list of headers and source files.
@@
-9,23
+9,15
@@
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.
# 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_LINUXAPP', 1)
- subdir('linuxapp/eal')
+dpdk_conf.set('RTE_EXEC_ENV_' + exec_env.to_upper(), 1)
+subdir(exec_env + '/eal')
-elif host_machine.system() == 'freebsd'
- dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1)
- subdir('bsdapp/eal')
-
-else
- error('unsupported system type "@0@"'.format(host_machine.system()))
-endif
-
-version = 8 # the version of the EAL API
+version = 10 # the version of the EAL API
allow_experimental_apis = true
allow_experimental_apis = true
-deps += 'compat'
deps += 'kvargs'
deps += 'kvargs'
-cflags += '-D_GNU_SOURCE'
+if dpdk_conf.has('RTE_USE_LIBBSD')
+ ext_deps += libbsd
+endif
sources = common_sources + env_sources
objs = common_objs + env_objs
headers = common_headers + env_headers
sources = common_sources + env_sources
objs = common_objs + env_objs
headers = common_headers + env_headers