net/pcap: simplify dependency checking using meson
Subsystems (2)
PATCH 1/1 net/pcap: simplify dependency checking using meson
Rather than trying to use meson's build-in detection for libpcap, and having to special-case cross-building, just check for the presence of pcap.h and the pcap library.
Signed-off-by Bruce Richardson <[email protected]>
--- drivers/net/pcap/meson.build | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
drivers/net/pcap/meson.build +5 -15
@@ -1,22 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if meson.is_cross_build() - pcap_dep = cc.find_library('pcap', required: false) - if pcap_dep.found() - ext_deps += pcap_dep - else - build = false - endif +pcap_dep = cc.find_library('pcap', required: false) +if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep) + build = true else - pcap_dep = dependency('pcap', required: false) - if pcap_dep.found() == true - ext_deps += pcap_dep - elif find_program('pcap-config', required: false).found() == true - ext_deps += cc.find_library('pcap') - else - build = false - endif + build = false endif sources = files('rte_eth_pcap.c') +ext_deps += pcap_dep pkgconfig_extra_libs += '-lpcap'
Signature · 1 line
2.14.3
Quoted 9 lines · Bruce Richardson
Rather than trying to use meson's build-in detection for libpcap, and having to special-case cross-building, just check for the presence of
pcap.hand the pcap library.Signed-off-by Bruce Richardson <[email protected]>--- drivers/net/pcap/meson.build | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
Tested-by Hemant Agrawal <[email protected]>
Quoted 11 lines · Hemant Agrawal
Quoted 9 lines · Bruce Richardson
Rather than trying to use meson's build-in detection for libpcap, and having to special-case cross-building, just check for the presence of
pcap.hand the pcap library.Signed-off-by Bruce Richardson <[email protected]>--- drivers/net/pcap/meson.build | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)Tested-by Hemant Agrawal <[email protected]>
Applied to dpdk-next-build
/Bruce