[dpdk-stable] patch 'build: fix drivers library path on Windows' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 621b21301cc0fcf240a6fc0622f58ec8ff798136 Mon Sep 17 00:00:00 2001
From: Tal Shnaiderman <talshn at mellanox.com>
Date: Mon, 29 Jun 2020 15:37:38 +0300
Subject: [PATCH] build: fix drivers library path on Windows

[ upstream commit 77cca7ccec13b617c64f21c573c9e6ac5b4aed64 ]

import library (/IMPLIB) in meson.build should use
the 'drivers' and not 'libs' folder.

The error is: fatal error LNK1149: output filename matches input filename.
The fix uses the correct folder.

Fixes: 5ed3766981 ("drivers: process shared link dependencies as for libs")

Signed-off-by: Tal Shnaiderman <talshn at mellanox.com>
---
 drivers/meson.build | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/meson.build b/drivers/meson.build
index 32d68aa1d..4246cc32a 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -151,7 +151,7 @@ foreach class:dpdk_driver_classes
 			version_map = '@0@/@1@/@2 at _version.map'.format(
 					meson.current_source_dir(),
 					drv_path, lib_name)
-			implib = dir_name + '.dll.a'
+			implib = 'lib' + lib_name + '.dll.a'
 
 			def_file = custom_target(lib_name + '_def',
 				command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],
@@ -159,8 +159,12 @@ foreach class:dpdk_driver_classes
 				output: '@0 at _exports.def'.format(lib_name))
 			lk_deps = [version_map, def_file]
 			if is_windows
-				lk_args = ['-Wl,/def:' + def_file.full_path(),
-					'-Wl,/implib:lib\\' + implib]
+				if is_ms_linker
+					lk_args = ['-Wl,/def:' + def_file.full_path(),
+						'-Wl,/implib:drivers\\' + implib]
+				else
+					lk_args = []
+				endif
 			else
 				lk_args = ['-Wl,--version-script=' + version_map]
 				# on unix systems check the output of the
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:50.802101153 +0100
+++ 0057-build-fix-drivers-library-path-on-Windows.patch	2020-07-24 12:53:48.275006236 +0100
@@ -1,8 +1,10 @@
-From 77cca7ccec13b617c64f21c573c9e6ac5b4aed64 Mon Sep 17 00:00:00 2001
+From 621b21301cc0fcf240a6fc0622f58ec8ff798136 Mon Sep 17 00:00:00 2001
 From: Tal Shnaiderman <talshn at mellanox.com>
 Date: Mon, 29 Jun 2020 15:37:38 +0300
 Subject: [PATCH] build: fix drivers library path on Windows
 
+[ upstream commit 77cca7ccec13b617c64f21c573c9e6ac5b4aed64 ]
+
 import library (/IMPLIB) in meson.build should use
 the 'drivers' and not 'libs' folder.
 
@@ -10,7 +12,6 @@
 The fix uses the correct folder.
 
 Fixes: 5ed3766981 ("drivers: process shared link dependencies as for libs")
-Cc: stable at dpdk.org
 
 Signed-off-by: Tal Shnaiderman <talshn at mellanox.com>
 ---
@@ -18,10 +19,10 @@
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/meson.build b/drivers/meson.build
-index 6ce2d6b50..ccdc73868 100644
+index 32d68aa1d..4246cc32a 100644
 --- a/drivers/meson.build
 +++ b/drivers/meson.build
-@@ -153,7 +153,7 @@ foreach class:dpdk_driver_classes
+@@ -151,7 +151,7 @@ foreach class:dpdk_driver_classes
  			version_map = '@0@/@1@/@2 at _version.map'.format(
  					meson.current_source_dir(),
  					drv_path, lib_name)
@@ -30,7 +31,7 @@
  
  			def_file = custom_target(lib_name + '_def',
  				command: [map_to_def_cmd, '@INPUT@', '@OUTPUT@'],
-@@ -161,8 +161,12 @@ foreach class:dpdk_driver_classes
+@@ -159,8 +159,12 @@ foreach class:dpdk_driver_classes
  				output: '@0 at _exports.def'.format(lib_name))
  			lk_deps = [version_map, def_file]
  			if is_windows