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
pflock: fix header file installation
[dpdk.git]
/
config
/
meson.build
diff --git
a/config/meson.build
b/config/meson.build
index
17b5bec
..
805d5d5
100644
(file)
--- a/
config/meson.build
+++ b/
config/meson.build
@@
-218,6
+218,11
@@
if libbsd.found()
dpdk_conf.set('RTE_USE_LIBBSD', 1)
endif
dpdk_conf.set('RTE_USE_LIBBSD', 1)
endif
+jansson_dep = dependency('jansson', required: false, method: 'pkg-config')
+if jansson_dep.found()
+ dpdk_conf.set('RTE_HAS_JANSSON', 1)
+endif
+
# check for pcap
pcap_dep = dependency('libpcap', required: false, method: 'pkg-config')
pcap_lib = is_windows ? 'wpcap' : 'pcap'
# check for pcap
pcap_dep = dependency('libpcap', required: false, method: 'pkg-config')
pcap_lib = is_windows ? 'wpcap' : 'pcap'
@@
-226,7
+231,7
@@
if not pcap_dep.found()
pcap_dep = cc.find_library(pcap_lib, required: false)
endif
if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep)
pcap_dep = cc.find_library(pcap_lib, required: false)
endif
if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep)
- dpdk_conf.set('RTE_
PORT_
PCAP', 1)
+ dpdk_conf.set('RTE_
HAS_LIB
PCAP', 1)
dpdk_extra_ldflags += '-l@0@'.format(pcap_lib)
endif
dpdk_extra_ldflags += '-l@0@'.format(pcap_lib)
endif
@@
-428,7
+433,7
@@
if get_option('b_sanitize') == 'address' or get_option('b_sanitize') == 'address
dpdk_extra_ldflags += '-lasan'
endif
dpdk_extra_ldflags += '-lasan'
endif
- if is_linux and
arch_subdir == 'x86' and
dpdk_conf.get('RTE_ARCH_64')
+ if is_linux and dpdk_conf.get('RTE_ARCH_64')
dpdk_conf.set10('RTE_MALLOC_ASAN', true)
endif
endif
dpdk_conf.set10('RTE_MALLOC_ASAN', true)
endif
endif