[dpdk-stable] patch 'build: fix install on Windows' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/19/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.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/ae832279c15934966871ebfda706e73dbb69dbf1

Thanks.

Luca Boccassi

---
>From ae832279c15934966871ebfda706e73dbb69dbf1 Mon Sep 17 00:00:00 2001
From: Nick Connolly <nick.connolly at mayadata.io>
Date: Sat, 31 Oct 2020 06:56:50 +0000
Subject: [PATCH] build: fix install on Windows

[ upstream commit 5c7d86948764f9cec832bf3c618e0cceb06ac512 ]

Don't run symlink-drivers-solibs.sh as part of 'install' because
Windows doesn't support shell scripts.

Fixes: 82ba4416dd87 ("build: add module definition files for Windows")

Signed-off-by: Nick Connolly <nick.connolly at mayadata.io>
Tested-by: Ranjit Menon <ranjit.menon at intel.com>
Acked-by: Ranjit Menon <ranjit.menon at intel.com>
---
 config/meson.build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/meson.build b/config/meson.build
index 9afd05b95e..fca0461d67 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -54,9 +54,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
 # driver .so files often depend upon the bus drivers for their connect bus,
 # e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
 # to be in the library path, so symlink the drivers from the main lib directory.
-meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
-		get_option('libdir'),
-		pmd_subdir_opt)
+if not is_windows
+	meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
+			get_option('libdir'),
+			pmd_subdir_opt)
+endif
 
 # set the machine type and cflags for it
 if meson.is_cross_build()
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:13.324166393 +0000
+++ 0008-build-fix-install-on-Windows.patch	2020-11-17 11:13:12.869115562 +0000
@@ -1 +1 @@
-From 5c7d86948764f9cec832bf3c618e0cceb06ac512 Mon Sep 17 00:00:00 2001
+From ae832279c15934966871ebfda706e73dbb69dbf1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c7d86948764f9cec832bf3c618e0cceb06ac512 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 258b01d068..a29693b883 100644
+index 9afd05b95e..fca0461d67 100644
@@ -23 +24 @@
-@@ -57,9 +57,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
+@@ -54,9 +54,11 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)