summaryrefslogtreecommitdiff
path: root/drivers/net/pcap
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2018-02-22 17:20:33 +0000
committerBruce Richardson <bruce.richardson@intel.com>2018-03-12 16:29:27 +0100
commit6930c0403a1754eb5cab89577565eefa5a9995a1 (patch)
tree10865d9141d12c185564a05f3d5f97fb9ba8a1e2 /drivers/net/pcap
parent749799482a72b9a8e3574242920d2774d0ff1df1 (diff)
downloaddpdk-next-eventdev-6930c0403a1754eb5cab89577565eefa5a9995a1.zip
dpdk-next-eventdev-6930c0403a1754eb5cab89577565eefa5a9995a1.tar.gz
dpdk-next-eventdev-6930c0403a1754eb5cab89577565eefa5a9995a1.tar.xz
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 <bruce.richardson@intel.com> Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Diffstat (limited to 'drivers/net/pcap')
-rw-r--r--drivers/net/pcap/meson.build20
1 files changed, 5 insertions, 15 deletions
diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build
index 8b81214..0c4e020 100644
--- a/drivers/net/pcap/meson.build
+++ b/drivers/net/pcap/meson.build
@@ -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'