From patchwork Thu Dec 12 17:28:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 63829 X-Patchwork-Delegate: xiaolong.ye@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A8541A04F5; Thu, 12 Dec 2019 18:28:58 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6287C1BF76; Thu, 12 Dec 2019 18:28:57 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 70D9A1BF74; Thu, 12 Dec 2019 18:28:55 +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 fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 09:28:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,306,1571727600"; d="scan'208";a="239026875" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga004.fm.intel.com with ESMTP; 12 Dec 2019 09:28:53 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson , rosen.xu@intel.com, tianfei.zhang@intel.com, stable@dpdk.org Date: Thu, 12 Dec 2019 17:28:43 +0000 Message-Id: <20191212172843.2521498-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] net/ipn3ke, raw/ifpga: fix 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" The ipn3ke driver and the ifpga driver had circular dependencies on each other, meaning that neither could be built with meson. Fix this by: * setting the build order of net and raw to match that in makefiles * removing the dependency from the net driver on the rawdev one * fixing the dependency names in the rawdev driver meson.build file Fixes: 8418c92811b4 ("net/ipn3ke: remove configuration for i40e port bonding") Fixes: e1defba4cf66 ("raw/ifpga/base: support device tree") Cc: rosen.xu@intel.com Cc: tianfei.zhang@intel.com Cc: stable@dpdk.org Signed-off-by: Bruce Richardson Acked-by: Rosen Xu --- drivers/meson.build | 4 ++-- drivers/net/ipn3ke/meson.build | 4 +++- drivers/raw/ifpga/meson.build | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 4b17662b7..2850d0f94 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -9,8 +9,8 @@ endif dpdk_driver_classes = ['common', 'bus', 'mempool', # depends on common and bus. - 'raw', # depends on common and bus. - 'net', # depends on common, bus, mempool and raw. + 'net', # depends on common, bus, mempool + 'raw', # depends on common, bus and net. 'crypto', # depends on common, bus and mempool (net in future). 'compress', # depends on common, bus, mempool. 'event', # depends on common, bus, mempool and net. diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build index e3c8a6768..bfec592ab 100644 --- a/drivers/net/ipn3ke/meson.build +++ b/drivers/net/ipn3ke/meson.build @@ -21,9 +21,11 @@ endif if build allow_experimental_apis = true + includes += include_directories('../../raw/ifpga') + sources += files('ipn3ke_ethdev.c', 'ipn3ke_representor.c', 'ipn3ke_tm.c', 'ipn3ke_flow.c') - deps += ['bus_ifpga', 'sched', 'pmd_i40e', 'rawdev', 'rawdev_ifpga'] + deps += ['bus_ifpga', 'ethdev', 'sched'] endif diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build index 206136ff4..d4027068d 100644 --- a/drivers/raw/ifpga/meson.build +++ b/drivers/raw/ifpga/meson.build @@ -15,7 +15,7 @@ if build objs = [base_objs] deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs', - 'bus_vdev', 'bus_ifpga', 'net', 'i40e', 'ipn3ke'] + 'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke'] ext_deps += dep sources = files('ifpga_rawdev.c')