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
net/txgbe: add L2 tunnel filter init and uninit
[dpdk.git]
/
config
/
meson.build
diff --git
a/config/meson.build
b/config/meson.build
index
d0e5932
..
a3154e2
100644
(file)
--- a/
config/meson.build
+++ b/
config/meson.build
@@
-57,9
+57,11
@@
eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
# driver .so files often depend upon the bus drivers for their connect bus,
# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
# to be in the library path, so symlink the drivers from the main lib directory.
# driver .so files often depend upon the bus drivers for their connect bus,
# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
# to be in the library path, so symlink the drivers from the main lib directory.
-meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
- get_option('libdir'),
- pmd_subdir_opt)
+if not is_windows
+ meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
+ get_option('libdir'),
+ pmd_subdir_opt)
+endif
# set the machine type and cflags for it
if meson.is_cross_build()
# set the machine type and cflags for it
if meson.is_cross_build()
@@
-192,6
+194,7
@@
warning_flags = [
# additional warnings in alphabetical order
'-Wcast-qual',
'-Wdeprecated',
# additional warnings in alphabetical order
'-Wcast-qual',
'-Wdeprecated',
+ '-Wformat',
'-Wformat-nonliteral',
'-Wformat-security',
'-Wmissing-declarations',
'-Wformat-nonliteral',
'-Wformat-security',
'-Wmissing-declarations',
@@
-218,7
+221,7
@@
if not dpdk_conf.get('RTE_ARCH_64')
warning_flags += '-Wno-pointer-to-int-cast'
endif
if cc.get_id() == 'intel'
warning_flags += '-Wno-pointer-to-int-cast'
endif
if cc.get_id() == 'intel'
- warning_ids = [188, 2203, 2279, 2557, 3179, 3656]
+ warning_ids = [18
1, 18
8, 2203, 2279, 2557, 3179, 3656]
foreach i:warning_ids
warning_flags += '-diag-disable=@0@'.format(i)
endforeach
foreach i:warning_ids
warning_flags += '-diag-disable=@0@'.format(i)
endforeach
@@
-253,7
+256,8
@@
dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
# set the install path for the drivers
dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
# set the install path for the drivers
dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path)
-install_headers('rte_config.h', subdir: get_option('include_subdir_arch'))
+install_headers(['rte_config.h', 'rte_compatibility_defines.h'],
+ subdir: get_option('include_subdir_arch'))
# enable VFIO only if it is linux OS
dpdk_conf.set('RTE_EAL_VFIO', is_linux)
# enable VFIO only if it is linux OS
dpdk_conf.set('RTE_EAL_VFIO', is_linux)
@@
-275,6
+279,13
@@
if is_windows
add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
endif
add_project_arguments('-D__USE_MINGW_ANSI_STDIO', language: 'c')
endif
+ # Disable secure CRT deprecated warnings for clang
+ if cc.get_id() == 'clang'
+ add_project_arguments('-D_CRT_SECURE_NO_WARNINGS', language: 'c')
+ endif
+
+ add_project_link_arguments('-lws2_32', language: 'c')
+
# Contrary to docs, VirtualAlloc2() is exported by mincore.lib
# in Windows SDK, while MinGW exports it by advapi32.a.
if is_ms_linker
# Contrary to docs, VirtualAlloc2() is exported by mincore.lib
# in Windows SDK, while MinGW exports it by advapi32.a.
if is_ms_linker