From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 10BA029CA for ; Thu, 22 Feb 2018 18:20:38 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Feb 2018 09:20:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,378,1515484800"; d="scan'208";a="32027176" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 22 Feb 2018 09:20:37 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Thu, 22 Feb 2018 17:20:33 +0000 Message-Id: <20180222172033.302037-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.14.3 Subject: [dpdk-dev] [PATCH] net/pcap: simplify dependency checking using meson X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Feb 2018 17:20:39 -0000 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 --- 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 8b81214e5..0c4e0201a 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.14.3