From 6930c0403a1754eb5cab89577565eefa5a9995a1 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 22 Feb 2018 17:20:33 +0000 Subject: [PATCH] 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 Tested-by: Hemant Agrawal --- drivers/net/pcap/meson.build | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build index 8b81214e50..0c4e0201a0 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' -- 2.20.1