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 189B0A04F5; Fri, 13 Dec 2019 02:26:28 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AD3971BF96; Fri, 13 Dec 2019 02:26:26 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 35D841BF90; Fri, 13 Dec 2019 02:26:23 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2019 17:26:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,307,1571727600"; d="scan'208";a="364158182" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga004.jf.intel.com with ESMTP; 12 Dec 2019 17:26:22 -0800 Received: from fmsmsx102.amr.corp.intel.com (10.18.124.200) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 12 Dec 2019 17:26:22 -0800 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX102.amr.corp.intel.com (10.18.124.200) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 12 Dec 2019 17:26:21 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.90]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.46]) with mapi id 14.03.0439.000; Fri, 13 Dec 2019 09:26:20 +0800 From: "Xu, Rosen" To: "Richardson, Bruce" , "dev@dpdk.org" CC: "Zhang, Tianfei" , "stable@dpdk.org" Thread-Topic: [PATCH] net/ipn3ke, raw/ifpga: fix meson build Thread-Index: AQHVsRGnBwwATW3VzkmF3TjUGxpyS6e3RkMg Date: Fri, 13 Dec 2019 01:26:19 +0000 Message-ID: <0E78D399C70DA940A335608C6ED296D73ABF7086@SHSMSX104.ccr.corp.intel.com> References: <20191212172843.2521498-1-bruce.richardson@intel.com> In-Reply-To: <20191212172843.2521498-1-bruce.richardson@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiN2UwMmU3MzQtZTRiNi00Mzg2LWFkYjItZTY1YjY2MGM2N2FlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiYk1vZzhpUDRSd1hVUE5jNzNFT0J0Qnd1TjdJbjNlNkJ3THpndlZMOTZCZ1JrWjZkSWxwY0NXWCs3RmpHV2krNiJ9 x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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" > -----Original Message----- > From: Richardson, Bruce > Sent: Friday, December 13, 2019 1:29 > To: dev@dpdk.org > Cc: Richardson, Bruce ; Xu, Rosen > ; Zhang, Tianfei ; > stable@dpdk.org > Subject: [PATCH] net/ipn3ke, raw/ifpga: fix meson build >=20 > The ipn3ke driver and the ifpga driver had circular dependencies on each > other, meaning that neither could be built with meson. Fix this by: >=20 > * 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 >=20 > 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 >=20 > 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(-) >=20 > 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 =3D ['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 =3D true >=20 > + includes +=3D include_directories('../../raw/ifpga') > + > sources +=3D files('ipn3ke_ethdev.c', > 'ipn3ke_representor.c', > 'ipn3ke_tm.c', > 'ipn3ke_flow.c') > - deps +=3D ['bus_ifpga', 'sched', 'pmd_i40e', 'rawdev', 'rawdev_ifpga'] > + deps +=3D ['bus_ifpga', 'ethdev', 'sched'] > endif > diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.buil= d > index 206136ff4..d4027068d 100644 > --- a/drivers/raw/ifpga/meson.build > +++ b/drivers/raw/ifpga/meson.build > @@ -15,7 +15,7 @@ if build > objs =3D [base_objs] >=20 > deps +=3D ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs', > - 'bus_vdev', 'bus_ifpga', 'net', 'i40e', 'ipn3ke'] > + 'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke'] > ext_deps +=3D dep >=20 > sources =3D files('ifpga_rawdev.c') > -- > 2.23.0 Acked-by: Rosen Xu