From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3354BA04F5; Fri, 13 Dec 2019 08:52:45 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 88AD82BD3; Fri, 13 Dec 2019 08:52:44 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id E69ED2BC8; Fri, 13 Dec 2019 08:52:41 +0100 (CET) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 23:52:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,308,1571727600"; d="scan'208";a="208378489" Received: from yexl-server.sh.intel.com (HELO localhost) ([10.67.117.17]) by orsmga008.jf.intel.com with ESMTP; 12 Dec 2019 23:52:39 -0800 Date: Fri, 13 Dec 2019 15:48:04 +0800 From: Ye Xiaolong To: Bruce Richardson Cc: dev@dpdk.org, rosen.xu@intel.com, tianfei.zhang@intel.com, stable@dpdk.org Message-ID: <20191213074804.GE59123@intel.com> References: <20191212172843.2521498-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191212172843.2521498-1-bruce.richardson@intel.com> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [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" On 12/12, Bruce Richardson wrote: >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 >--- > 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') >-- >2.23.0 > Applied to dpdk-next-net-intel, Thanks.