[v5,5/8] drivers: ignore pmdinfogen generation for Windows

Message ID 20200609103139.22168-6-talshn@mellanox.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series Windows bus/pci support |

Checks

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

Commit Message

Tal Shnaiderman June 9, 2020, 10:31 a.m. UTC
  From: Tal Shnaiderman <talshn@mellanox.com>

pmdinfogen generation is currently unsupported for Windows.
The relevant part in meson.build is skipped.

Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
---
 drivers/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
  

Comments

Dmitry Kozlyuk June 17, 2020, 8:39 p.m. UTC | #1
On Tue,  9 Jun 2020 13:31:36 +0300
talshn@mellanox.com wrote:

> From: Tal Shnaiderman <talshn@mellanox.com>
> 
> pmdinfogen generation is currently unsupported for Windows.
> The relevant part in meson.build is skipped.
> 
> Signed-off-by: Tal Shnaiderman <talshn@mellanox.com>
> ---
>  drivers/meson.build | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/meson.build b/drivers/meson.build
> index cfb6a833c9..a7eac86790 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -107,6 +107,7 @@ foreach class:dpdk_driver_classes
>  
>  			dpdk_extra_ldflags += pkgconfig_extra_libs
>  
> +			if host_machine.system() != 'windows'
>  			# generate pmdinfo sources by building a temporary
>  			# lib and then running pmdinfogen on the contents of
>  			# that lib. The final lib reuses the object files and
> @@ -123,7 +124,7 @@ foreach class:dpdk_driver_classes
>  						'@OUTPUT@', pmdinfogen],
>  					output: out_filename,
>  					depends: [pmdinfogen, tmp_lib])
> -
> +			endif
>  			version_map = '@0@/@1@/@2@_version.map'.format(
>  					meson.current_source_dir(),
>  					drv_path, lib_name)

Lack of indentation here is misleading. If you move the comment above "if",
there's not much to rewrap inside after indenting.
  

Patch

diff --git a/drivers/meson.build b/drivers/meson.build
index cfb6a833c9..a7eac86790 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -107,6 +107,7 @@  foreach class:dpdk_driver_classes
 
 			dpdk_extra_ldflags += pkgconfig_extra_libs
 
+			if host_machine.system() != 'windows'
 			# generate pmdinfo sources by building a temporary
 			# lib and then running pmdinfogen on the contents of
 			# that lib. The final lib reuses the object files and
@@ -123,7 +124,7 @@  foreach class:dpdk_driver_classes
 						'@OUTPUT@', pmdinfogen],
 					output: out_filename,
 					depends: [pmdinfogen, tmp_lib])
-
+			endif
 			version_map = '@0@/@1@/@2@_version.map'.format(
 					meson.current_source_dir(),
 					drv_path, lib_name)