[dpdk-stable] patch 'net/mlx: fix build with make and recent gcc' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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/29/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/d0690d9eeb8a85fe0db5231c7d66dabe80f3faf0

Thanks.

Kevin.

---
>From d0690d9eeb8a85fe0db5231c7d66dabe80f3faf0 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Tue, 13 Aug 2019 01:03:56 +0200
Subject: [PATCH] net/mlx: fix build with make and recent gcc

[ upstream commit b38a54aeb16cb36e42d638c4335b8314aa0b1794 ]

With VERBOSE=1, this error was seen in debug mode with gcc 9.1:

In file included from /tmp/dpdk.auto-config-h.sh.c.w0VWMi:1:
In file included from rdma-core/build/include/infiniband/mlx5dv.h:47:
In file included from rdma-core/build/include/infiniband/verbs.h:46:
In file included from rdma-core/build/include/infiniband/verbs_api.h:66:
In file included from rdma-core/build/include/infiniband/ib_user_ioctl_verbs.h:38:
include/rdma/ib_user_verbs.h:161:28: fatal error:
zero size arrays are an extension [-Wzero-length-array]
__aligned_u64 driver_data0;
^
1 error generated.

As a result, buildtools/auto-config-h.sh was not generating
a correct autoconf file, so the compilation was generating such error:

fatal error: redefinition of 'mlx5_ib_uapi_flow_action_packet_reformat_type'

It is fixed by disabling -pedantic option when calling auto-config-h.sh
from the makefile-based system.

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Luca Boccassi <bluca at debian.org>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx4/Makefile | 3 ++-
 drivers/net/mlx5/Makefile | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile
index 92e932250..df20c83d5 100644
--- a/drivers/net/mlx4/Makefile
+++ b/drivers/net/mlx4/Makefile
@@ -66,4 +66,5 @@ endif
 ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y)
 CFLAGS += -pedantic -UNDEBUG -DPEDANTIC
+AUTO_CONFIG_CFLAGS += -Wno-pedantic
 else
 CFLAGS += -DNDEBUG -UPEDANTIC
@@ -75,5 +76,5 @@ include $(RTE_SDK)/mk/rte.lib.mk
 
 export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS
-export AUTO_CONFIG_CFLAGS = -Wno-error
+export AUTO_CONFIG_CFLAGS += -Wno-error
 
 ifndef V
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 63dfa45b2..3b2f626d4 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -84,4 +84,5 @@ endif
 ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y)
 CFLAGS += -pedantic -UNDEBUG -DPEDANTIC
+AUTO_CONFIG_CFLAGS += -Wno-pedantic
 else
 CFLAGS += -DNDEBUG -UPEDANTIC
@@ -93,5 +94,5 @@ include $(RTE_SDK)/mk/rte.lib.mk
 
 export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS
-export AUTO_CONFIG_CFLAGS = -Wno-error
+export AUTO_CONFIG_CFLAGS += -Wno-error
 
 ifndef V
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-11-22 14:36:56.506383252 +0000
+++ 0024-net-mlx-fix-build-with-make-and-recent-gcc.patch	2019-11-22 14:36:55.192149393 +0000
@@ -1 +1 @@
-From b38a54aeb16cb36e42d638c4335b8314aa0b1794 Mon Sep 17 00:00:00 2001
+From d0690d9eeb8a85fe0db5231c7d66dabe80f3faf0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b38a54aeb16cb36e42d638c4335b8314aa0b1794 ]
+
@@ -27,2 +28,0 @@
-Cc: stable at dpdk.org
-
@@ -38 +38 @@
-index 8126b0dfc..25d7c7555 100644
+index 92e932250..df20c83d5 100644
@@ -41 +41 @@
-@@ -69,4 +69,5 @@ endif
+@@ -66,4 +66,5 @@ endif
@@ -47 +47 @@
-@@ -78,5 +79,5 @@ include $(RTE_SDK)/mk/rte.lib.mk
+@@ -75,5 +76,5 @@ include $(RTE_SDK)/mk/rte.lib.mk
@@ -55 +55 @@
-index dbb2a4e80..299cf3afe 100644
+index 63dfa45b2..3b2f626d4 100644