DPDK patches and discussions
 help / color / mirror / Atom feed
From: "Xu, Rosen" <rosen.xu@intel.com>
To: "Richardson, Bruce" <bruce.richardson@intel.com>,
	"dev@dpdk.org" <dev@dpdk.org>
Cc: "Zhang, Tianfei" <tianfei.zhang@intel.com>,
	"stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH] net/ipn3ke, raw/ifpga: fix meson build
Date: Fri, 13 Dec 2019 01:26:19 +0000	[thread overview]
Message-ID: <0E78D399C70DA940A335608C6ED296D73ABF7086@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20191212172843.2521498-1-bruce.richardson@intel.com>



> -----Original Message-----
> From: Richardson, Bruce <bruce.richardson@intel.com>
> Sent: Friday, December 13, 2019 1:29
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richardson@intel.com>; Xu, Rosen
> <rosen.xu@intel.com>; Zhang, Tianfei <tianfei.zhang@intel.com>;
> stable@dpdk.org
> Subject: [PATCH] net/ipn3ke, raw/ifpga: fix meson build
> 
> 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 <bruce.richardson@intel.com>
> ---
>  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

Acked-by: Rosen Xu <rosen.xu@intel.com>


  reply	other threads:[~2019-12-13  1:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-12 17:28 Bruce Richardson
2019-12-13  1:26 ` Xu, Rosen [this message]
2019-12-13  7:48 ` Ye Xiaolong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0E78D399C70DA940A335608C6ED296D73ABF7086@SHSMSX104.ccr.corp.intel.com \
    --to=rosen.xu@intel.com \
    --cc=bruce.richardson@intel.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    --cc=tianfei.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).