[dpdk-dev] net/i40e: fix missing defines for non-AVX builds

Message ID 20180508201017.44057-1-bruce.richardson@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Bruce Richardson
Headers

Checks

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

Commit Message

Bruce Richardson May 8, 2018, 8:10 p.m. UTC
  For non-AVX builds, the cflags used for compiling the i40e driver files
are not passed to the call to build the AVX-specific code path. This can
cause build failures.

../drivers/net/i40e/i40e_ethdev.h:888:42: error: ‘I40E_PFQF_HKEY_MAX_INDEX’ undeclared here (not in a function)

Fixes: e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")

Reported-by: Shreyansh Jain <shreyansh.jain@nxp.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Shreyansh Jain <shreyansh.jain@nxp.com>

----
Testing previously done on draft version of this patch. Ref:
http://dpdk.org/ml/archives/dev/2018-May/100301.html
---
 drivers/net/i40e/meson.build | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
  

Comments

Bruce Richardson May 8, 2018, 8:15 p.m. UTC | #1
On Tue, May 08, 2018 at 09:10:17PM +0100, Bruce Richardson wrote:
> For non-AVX builds, the cflags used for compiling the i40e driver files
> are not passed to the call to build the AVX-specific code path. This can
> cause build failures.
> 
> ../drivers/net/i40e/i40e_ethdev.h:888:42: error: ‘I40E_PFQF_HKEY_MAX_INDEX’ undeclared here (not in a function)
> 
> Fixes: e940646b20fa ("drivers/net: build Intel NIC PMDs with meson")
> 
> Reported-by: Shreyansh Jain <shreyansh.jain@nxp.com>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> Tested-by: Shreyansh Jain <shreyansh.jain@nxp.com>
> 
> ----
Applied to dpdk-next-build

/Bruce
  

Patch

diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index f2129df07..d783f3626 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -25,6 +25,7 @@  sources = files(
 	)
 
 deps += ['hash']
+includes += include_directories('base')
 
 if arch_subdir == 'x86'
 	dpdk_conf.set('RTE_LIBRTE_I40E_INC_VECTOR', 1)
@@ -40,11 +41,10 @@  if arch_subdir == 'x86'
 				'i40e_rxtx_vec_avx2.c',
 				dependencies: [static_rte_ethdev,
 					static_rte_kvargs, static_rte_hash],
-				c_args: '-mavx2')
+				include_directories: includes,
+				c_args: [cflags, '-mavx2'])
 		objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
 	endif
 endif
 
-includes += include_directories('base')
-
 install_headers('rte_pmd_i40e.h')