From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 61A1D1D7 for ; Tue, 19 Dec 2017 11:52:40 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Dec 2017 02:52:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,426,1508828400"; d="scan'208";a="185436250" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by orsmga005.jf.intel.com with ESMTP; 19 Dec 2017 02:52:38 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: bluca@debian.org, jerin.jacob@caviumnetworks.com, hemant.agrawal@nxp.com, Bruce Richardson Date: Tue, 19 Dec 2017 10:52:22 +0000 Message-Id: <20171219105222.198664-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171219105222.198664-1-bruce.richardson@intel.com> References: <20171219105222.198664-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH 2/2] net/pcap: fix cross compilation 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: Tue, 19 Dec 2017 10:52:40 -0000 The detection of pcap as a dependency involves invoking pcap-config to get parameters - something not possible in a cross-compilation environment. Therefore we need to just look for the presence of the library in a cross-compilation environment and assume if the library is present we can compile and link against it. Signed-off-by: Bruce Richardson --- drivers/net/pcap/meson.build | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build index 2051ccab0..36f997c39 100644 --- a/drivers/net/pcap/meson.build +++ b/drivers/net/pcap/meson.build @@ -29,13 +29,22 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -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') +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 else - build = false + 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 endif sources = files('rte_eth_pcap.c') pkgconfig_extra_libs += '-lpcap' -- 2.14.3