[dpdk-stable] patch 'net/mlx5: fallback quietly if pkg-config is unavailable' 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 12/08/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 2db19a3d6b42be55a8653be9c6a88c2acdbc232b Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca at debian.org>
Date: Fri, 9 Nov 2018 22:48:07 +0000
Subject: [PATCH] net/mlx5: fallback quietly if pkg-config is unavailable

[ upstream commit 0c9df53de400e187238fb0b2cf379c1739ed78ac ]

Don't fail the build if pkg-config can't be found, instead print the
linker flag as it was doing before the change.

Fixes: b6b87939193a ("net/mlx5: use pkg-config to handle SUSE libmnl")

Reported-by: Thomas Monjalon <thomas at monjalon.net>
Signed-off-by: Luca Boccassi <bluca at debian.org>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 drivers/net/mlx5/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 08b616567..04d77c6fd 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -50,5 +50,5 @@ CFLAGS += -D_XOPEN_SOURCE=600
 CFLAGS += $(WERROR_FLAGS)
 CFLAGS += -Wno-strict-prototypes
-CFLAGS += $(shell pkg-config --cflags libmnl)
+CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags libmnl)
 ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)
 CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"'
@@ -59,5 +59,5 @@ else
 LDLIBS += -libverbs -lmlx5
 endif
-LDLIBS += $(shell pkg-config --libs libmnl)
+LDLIBS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --libs libmnl || echo "-lmnl")
 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-29 13:11:35.536320115 +0000
+++ 0019-net-mlx5-fallback-quietly-if-pkg-config-is-unavailab.patch	2018-11-29 13:11:34.000000000 +0000
@@ -1,13 +1,14 @@
-From 0c9df53de400e187238fb0b2cf379c1739ed78ac Mon Sep 17 00:00:00 2001
+From 2db19a3d6b42be55a8653be9c6a88c2acdbc232b Mon Sep 17 00:00:00 2001
 From: Luca Boccassi <bluca at debian.org>
 Date: Fri, 9 Nov 2018 22:48:07 +0000
 Subject: [PATCH] net/mlx5: fallback quietly if pkg-config is unavailable
 
+[ upstream commit 0c9df53de400e187238fb0b2cf379c1739ed78ac ]
+
 Don't fail the build if pkg-config can't be found, instead print the
 linker flag as it was doing before the change.
 
 Fixes: b6b87939193a ("net/mlx5: use pkg-config to handle SUSE libmnl")
-Cc: stable at dpdk.org
 
 Reported-by: Thomas Monjalon <thomas at monjalon.net>
 Signed-off-by: Luca Boccassi <bluca at debian.org>
@@ -17,17 +18,17 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
-index 7a50bccd2..895cdfeed 100644
+index 08b616567..04d77c6fd 100644
 --- a/drivers/net/mlx5/Makefile
 +++ b/drivers/net/mlx5/Makefile
-@@ -52,5 +52,5 @@ CFLAGS += -D_XOPEN_SOURCE=600
+@@ -50,5 +50,5 @@ CFLAGS += -D_XOPEN_SOURCE=600
  CFLAGS += $(WERROR_FLAGS)
  CFLAGS += -Wno-strict-prototypes
 -CFLAGS += $(shell pkg-config --cflags libmnl)
 +CFLAGS += $(shell command -v pkg-config > /dev/null 2>&1 && pkg-config --cflags libmnl)
  ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DLOPEN_DEPS),y)
  CFLAGS += -DMLX5_GLUE='"$(LIB_GLUE)"'
-@@ -61,5 +61,5 @@ else
+@@ -59,5 +59,5 @@ else
  LDLIBS += -libverbs -lmlx5
  endif
 -LDLIBS += $(shell pkg-config --libs libmnl)