From patchwork Fri Jun 8 21:20:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 40950 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BCF201D087; Fri, 8 Jun 2018 23:21:19 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 085061D079 for ; Fri, 8 Jun 2018 23:21:16 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Jun 2018 14:21:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,491,1520924400"; d="scan'208";a="61610774" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga004.fm.intel.com with ESMTP; 08 Jun 2018 14:21:15 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , Ferruh Yigit Date: Fri, 8 Jun 2018 22:20:43 +0100 Message-Id: <20180608212048.67261-11-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608212048.67261-1-bruce.richardson@intel.com> References: <20180517201526.28658-1-bruce.richardson@intel.com> <20180608212048.67261-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 10/15] net/kni: add to meson build 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since the kni library is an optional library, we need to add a check here to ensure that the kni wrapper PMD is only built when the main kni lib is being built. CC: Ferruh Yigit Signed-off-by: Bruce Richardson --- drivers/net/kni/meson.build | 8 ++++++++ drivers/net/meson.build | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 drivers/net/kni/meson.build diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build new file mode 100644 index 000000000..77468188b --- /dev/null +++ b/drivers/net/kni/meson.build @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Intel Corporation + +# this driver can be built if-and-only-if KNI library is buildable +build = dpdk_conf.has('LIB_LIBRTE_KNI') +allow_experimental_apis = true +sources = files('rte_eth_kni.c') +deps += 'kni' diff --git a/drivers/net/meson.build b/drivers/net/meson.build index c983f90b1..213fe734c 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -6,7 +6,8 @@ drivers = ['af_packet', 'ark', 'avp', 'bnxt', 'cxgbe', 'dpaa', 'dpaa2', 'e1000', 'ena', 'enic', 'failsafe', 'fm10k', 'i40e', 'ifcvf', 'ixgbe', - 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', + 'kni', 'mvpp2', 'null', + 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std