[dpdk-stable] patch 'net/mlx5: use pkg-config to handle SUSE libmnl' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

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/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From a2b805348b9ab46043fd338d649b8818e1f6c88f Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Thu, 25 Oct 2018 13:29:38 -0700
Subject: [PATCH] net/mlx5: use pkg-config to handle SUSE libmnl

[ upstream commit b6b87939193a178ffaf48b180df101548620f00f ]

SUSE decided to install the libmnl include file in a non-standard
place: /usr/include/libmnl/libmnl/libmnl.h

This was probably a mistake by the SUSE package maintainer,
but hard to get fixed. Workaround the problem by pkg-config to find
the necessary include directive for libmnl.

Fixes: 20b71e92ef8e ("net/mlx5: lay groundwork for switch offloads")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Yongseok Koh <yskoh at mellanox.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 drivers/net/mlx5/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 2e70dec5b..08b616567 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -50,4 +50,5 @@ CFLAGS += -D_XOPEN_SOURCE=600
 CFLAGS += $(WERROR_FLAGS)
 CFLAGS += -Wno-strict-prototypes
+CFLAGS += $(shell pkg-config --cflags libmnl)
 ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)
 CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"'
@@ -58,5 +59,5 @@ else
 LDLIBS += -libverbs -lmlx5
 endif
-LDLIBS += -lmnl
+LDLIBS += $(shell pkg-config --libs libmnl)
 LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
 LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-23 10:22:55.013903097 +0000
+++ 0029-net-mlx5-use-pkg-config-to-handle-SUSE-libmnl.patch	2018-11-23 10:22:54.000000000 +0000
@@ -1,8 +1,10 @@
-From b6b87939193a178ffaf48b180df101548620f00f Mon Sep 17 00:00:00 2001
+From a2b805348b9ab46043fd338d649b8818e1f6c88f Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <stephen at networkplumber.org>
 Date: Thu, 25 Oct 2018 13:29:38 -0700
 Subject: [PATCH] net/mlx5: use pkg-config to handle SUSE libmnl
 
+[ upstream commit b6b87939193a178ffaf48b180df101548620f00f ]
+
 SUSE decided to install the libmnl include file in a non-standard
 place: /usr/include/libmnl/libmnl/libmnl.h
 
@@ -11,7 +13,6 @@
 the necessary include directive for libmnl.
 
 Fixes: 20b71e92ef8e ("net/mlx5: lay groundwork for switch offloads")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
 Acked-by: Yongseok Koh <yskoh at mellanox.com>
@@ -21,16 +22,16 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
-index fecb57c18..0beb139ea 100644
+index 2e70dec5b..08b616567 100644
 --- a/drivers/net/mlx5/Makefile
 +++ b/drivers/net/mlx5/Makefile
-@@ -52,4 +52,5 @@ CFLAGS += -D_XOPEN_SOURCE=600
+@@ -50,4 +50,5 @@ CFLAGS += -D_XOPEN_SOURCE=600
  CFLAGS += $(WERROR_FLAGS)
  CFLAGS += -Wno-strict-prototypes
 +CFLAGS += $(shell pkg-config --cflags libmnl)
  ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)
  CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"'
-@@ -60,5 +61,5 @@ else
+@@ -58,5 +59,5 @@ else
  LDLIBS += -libverbs -lmlx5
  endif
 -LDLIBS += -lmnl