[dpdk-dev,v7,4/5] iFPGA: add meson build

Message ID 1525443062-43231-5-git-send-email-rosen.xu@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Xu, Rosen May 4, 2018, 2:11 p.m. UTC
  From: Figo Zhang <tianfei.zhang@intel.com>

add meson build support for iFPGA driver.

Signed-off-by: Figo Zhang <tianfei.zhang@intel.com>
---
 drivers/meson.build                       |  3 ++-
 drivers/raw/ifpga_rawdev/base/meson.build | 34 +++++++++++++++++++++++++++++++
 drivers/raw/ifpga_rawdev/meson.build      | 15 ++++++++++++++
 drivers/raw/meson.build                   |  6 ++++++
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 drivers/raw/ifpga_rawdev/base/meson.build
 create mode 100644 drivers/raw/ifpga_rawdev/meson.build
 create mode 100644 drivers/raw/meson.build
  

Comments

Shreyansh Jain May 5, 2018, 6:21 p.m. UTC | #1
> -----Original Message-----
> From: Xu, Rosen [mailto:rosen.xu@intel.com]
> Sent: Friday, May 4, 2018 7:41 PM
> To: dev@dpdk.org
> Cc: rosen.xu@intel.com; declan.doherty@intel.com;
> bruce.richardson@intel.com; Shreyansh Jain <shreyansh.jain@nxp.com>;
> ferruh.yigit@intel.com; konstantin.ananyev@intel.com;
> tianfei.zhang@intel.com; song.liu@intel.com; hao.wu@intel.com;
> gaetan.rivet@6wind.com
> Subject: [PATCH v7 4/5] iFPGA: add meson build
> 

[...]

> index 0000000..6725687
> --- /dev/null
> +++ b/drivers/raw/ifpga_rawdev/meson.build
> @@ -0,0 +1,15 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2018 Intel Corporation
> +
> +version = 1
> +
> +subdir('base')
> +objs = [base_objs]
> +
> +deps += ['rawdev', 'pci', 'bus_pci', 'kvargs',
> +	'bus_vdev', 'bus_ifpga']
> +sources = files('ifpga_rawdev.c')
> +
> +includes += include_directories('base')
> +
> +allow_experimental_apis = true
> diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
> new file mode 100644
> index 0000000..410f908
> --- /dev/null
> +++ b/drivers/raw/meson.build
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2017 Intel Corporation
> +
> +drivers = ['ifpga_rawdev']
> +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
> +driver_name_fmt = 'rte_@0@'

I think you missed this again. From [1], you were to base your patch over cmdif so that this drivers/raw/meson.build introduction doesn't conflict.

Can you rebase and send once again, but *only* once cmdif patches have been merged?

[1] http://dpdk.org/ml/archives/dev/2018-May/100064.html
  
Zhang, Tianfei May 6, 2018, 12:27 a.m. UTC | #2
> -----Original Message-----
> From: Shreyansh Jain [mailto:shreyansh.jain@nxp.com]
> Sent: Sunday, May 6, 2018 2:22 AM
> To: Xu, Rosen <rosen.xu@intel.com>; dev@dpdk.org
> Cc: Doherty, Declan <declan.doherty@intel.com>; Richardson, Bruce
> <bruce.richardson@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>;
> Ananyev, Konstantin <konstantin.ananyev@intel.com>; Zhang, Tianfei
> <tianfei.zhang@intel.com>; Liu, Song <song.liu@intel.com>; Wu, Hao
> <hao.wu@intel.com>; gaetan.rivet@6wind.com
> Subject: RE: [PATCH v7 4/5] iFPGA: add meson build
> 
> > -----Original Message-----
> > From: Xu, Rosen [mailto:rosen.xu@intel.com]
> > Sent: Friday, May 4, 2018 7:41 PM
> > To: dev@dpdk.org
> > Cc: rosen.xu@intel.com; declan.doherty@intel.com;
> > bruce.richardson@intel.com; Shreyansh Jain <shreyansh.jain@nxp.com>;
> > ferruh.yigit@intel.com; konstantin.ananyev@intel.com;
> > tianfei.zhang@intel.com; song.liu@intel.com; hao.wu@intel.com;
> > gaetan.rivet@6wind.com
> > Subject: [PATCH v7 4/5] iFPGA: add meson build
> >
> 
> [...]
> 
> > index 0000000..6725687
> > --- /dev/null
> > +++ b/drivers/raw/ifpga_rawdev/meson.build
> > @@ -0,0 +1,15 @@
> > +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel
> > +Corporation
> > +
> > +version = 1
> > +
> > +subdir('base')
> > +objs = [base_objs]
> > +
> > +deps += ['rawdev', 'pci', 'bus_pci', 'kvargs',
> > +	'bus_vdev', 'bus_ifpga']
> > +sources = files('ifpga_rawdev.c')
> > +
> > +includes += include_directories('base')
> > +
> > +allow_experimental_apis = true
> > diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build new
> > file mode 100644 index 0000000..410f908
> > --- /dev/null
> > +++ b/drivers/raw/meson.build
> > @@ -0,0 +1,6 @@
> > +# SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel
> > +Corporation
> > +
> > +drivers = ['ifpga_rawdev']
> > +config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
> > +driver_name_fmt = 'rte_@0@'
> 
> I think you missed this again. From [1], you were to base your patch over
> cmdif so that this drivers/raw/meson.build introduction doesn't conflict.
> 
> Can you rebase and send once again, but *only* once cmdif patches have
> been merged?
> 
> [1] http://dpdk.org/ml/archives/dev/2018-May/100064.html

Oh, we will modify it and send the v8 patches today.
  

Patch

diff --git a/drivers/meson.build b/drivers/meson.build
index b146f09..b7fc0d6 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -7,7 +7,8 @@  driver_classes = ['common',
 	       'mempool', # depends on common and bus.
 	       'net',     # depends on common, bus and mempool.
 	       'crypto',  # depends on common, bus and mempool (net in future).
-	       'event']   # depends on common, bus, mempool and net.
+	       'event',   # depends on common, bus, mempool and net.
+		'raw']
 
 foreach class:driver_classes
 	drivers = []
diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build
new file mode 100644
index 0000000..cb65535
--- /dev/null
+++ b/drivers/raw/ifpga_rawdev/base/meson.build
@@ -0,0 +1,34 @@ 
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+sources = [
+	'ifpga_api.c',
+	'ifpga_enumerate.c',
+	'ifpga_feature_dev.c',
+	'ifpga_fme.c',
+	'ifpga_fme_iperf.c',
+	'ifpga_fme_dperf.c',
+	'ifpga_fme_error.c',
+	'ifpga_port.c',
+	'ifpga_port_error.c',
+	'ifpga_fme_pr.c',
+	'opae_hw_api.c',
+	'opae_ifpga_hw_api.c',
+	'opae_debug.c'
+]
+
+error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
+		'-Wno-format', '-Wno-unused-but-set-variable',
+		'-Wno-strict-aliasing'
+]
+c_args = cflags
+foreach flag: error_cflags
+	if cc.has_argument(flag)
+		c_args += flag
+	endif
+endforeach
+
+base_lib = static_library('ifpga_rawdev_base', sources,
+	dependencies: static_rte_eal,
+	c_args: c_args)
+base_objs = base_lib.extract_all_objects()
diff --git a/drivers/raw/ifpga_rawdev/meson.build b/drivers/raw/ifpga_rawdev/meson.build
new file mode 100644
index 0000000..6725687
--- /dev/null
+++ b/drivers/raw/ifpga_rawdev/meson.build
@@ -0,0 +1,15 @@ 
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2018 Intel Corporation
+
+version = 1
+
+subdir('base')
+objs = [base_objs]
+
+deps += ['rawdev', 'pci', 'bus_pci', 'kvargs',
+	'bus_vdev', 'bus_ifpga']
+sources = files('ifpga_rawdev.c')
+
+includes += include_directories('base')
+
+allow_experimental_apis = true
diff --git a/drivers/raw/meson.build b/drivers/raw/meson.build
new file mode 100644
index 0000000..410f908
--- /dev/null
+++ b/drivers/raw/meson.build
@@ -0,0 +1,6 @@ 
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2017 Intel Corporation
+
+drivers = ['ifpga_rawdev']
+config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
+driver_name_fmt = 'rte_@0@'