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
doc: update release notes for Windows support
[dpdk.git]
/
drivers
/
meson.build
diff --git
a/drivers/meson.build
b/drivers/meson.build
index
f879cb6
..
4c444f4
100644
(file)
--- a/
drivers/meson.build
+++ b/
drivers/meson.build
@@
-1,16
+1,30
@@
# SPDX-License-Identifier: BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017-2019 Intel Corporation
+
+if is_windows
+ subdir_done()
+endif
# Defines the order in which the drivers are buit.
# Defines the order in which the drivers are buit.
-driver_classes = ['common',
+d
pdk_d
river_classes = ['common',
'bus',
'mempool', # depends on common and bus.
'net', # depends on common, bus and mempool.
'crypto', # depends on common, bus and mempool (net in future).
'bus',
'mempool', # depends on common and bus.
'net', # depends on common, bus and mempool.
'crypto', # depends on common, bus and mempool (net in future).
+ 'compress', # depends on common, bus, mempool.
'event', # depends on common, bus, mempool and net.
'event', # depends on common, bus, mempool and net.
+ 'baseband', # depends on common and bus.
'raw'] # depends on common, bus, mempool, net and event.
'raw'] # depends on common, bus, mempool, net and event.
-foreach class:driver_classes
+default_cflags = machine_args
+if cc.has_argument('-Wno-format-truncation')
+ default_cflags += '-Wno-format-truncation'
+endif
+
+# specify -D_GNU_SOURCE unconditionally
+default_cflags += '-D_GNU_SOURCE'
+
+foreach class:dpdk_driver_classes
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
@@
-19,6
+33,7
@@
foreach class:driver_classes
# version file for linking
subdir(class)
# version file for linking
subdir(class)
+ class_drivers = []
foreach drv:drivers
drv_path = join_paths(class, drv)
foreach drv:drivers
drv_path = join_paths(class, drv)
@@
-30,15
+45,16
@@
foreach class:driver_classes
allow_experimental_apis = false
sources = []
objs = []
allow_experimental_apis = false
sources = []
objs = []
- cflags =
machine_ar
gs
+ cflags =
default_cfla
gs
includes = [include_directories(drv_path)]
# set up internal deps. Drivers can append/override as necessary
deps = std_deps
# ext_deps: Stores external library dependency got
includes = [include_directories(drv_path)]
# set up internal deps. Drivers can append/override as necessary
deps = std_deps
# ext_deps: Stores external library dependency got
- # using dependency() or cc.find_library(). For most cases, we
- # probably also need to specify the "-l" flags in
- # pkgconfig_extra_libs variable too, so that it can be reflected
- # in the pkgconfig output for static builds
+ # using dependency() (preferred) or find_library().
+ # For the find_library() case (but not with dependency()) we also
+ # need to specify the "-l" flags in pkgconfig_extra_libs variable
+ # too, so that it can be reflected in the pkgconfig output for
+ # static builds.
ext_deps = []
pkgconfig_extra_libs = []
ext_deps = []
pkgconfig_extra_libs = []
@@
-46,6
+62,8
@@
foreach class:driver_classes
subdir(drv_path)
if build
subdir(drv_path)
if build
+ class_drivers += name
+
dpdk_conf.set(config_flag_fmt.format(name.to_upper()),1)
lib_name = driver_name_fmt.format(name)
dpdk_conf.set(config_flag_fmt.format(name.to_upper()),1)
lib_name = driver_name_fmt.format(name)
@@
-57,6
+75,10
@@
foreach class:driver_classes
shared_objs = []
static_objs = []
foreach d:deps
shared_objs = []
static_objs = []
foreach d:deps
+ if not is_variable('shared_rte_' + d)
+ error('Missing dependency ' + d +
+ ' for driver ' + lib_name)
+ endif
shared_objs += [get_variable('shared_rte_' + d)]
static_objs += [get_variable('static_rte_' + d)]
endforeach
shared_objs += [get_variable('shared_rte_' + d)]
static_objs += [get_variable('static_rte_' + d)]
endforeach
@@
-85,10
+107,8
@@
foreach class:driver_classes
lib_version = '@0@.1'.format(version)
so_version = '@0@'.format(version)
else
lib_version = '@0@.1'.format(version)
so_version = '@0@'.format(version)
else
- pver = meson.project_version().split('.')
- lib_version = '@0@.@1@'.format(pver.get(0),
- pver.get(1))
- so_version = lib_version
+ lib_version = major_version
+ so_version = major_version
endif
# now build the static driver
endif
# now build the static driver
@@
-132,4
+152,6
@@
foreach class:driver_classes
set_variable('static_@0@'.format(lib_name), static_dep)
endif # build
endforeach
set_variable('static_@0@'.format(lib_name), static_dep)
endif # build
endforeach
+
+ set_variable(class + '_drivers', class_drivers)
endforeach
endforeach