From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id ED20D1B4B6 for ; Thu, 29 Nov 2018 14:22:20 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2AB84C04B2E0; Thu, 29 Nov 2018 13:22:20 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 565271001F50; Thu, 29 Nov 2018 13:22:18 +0000 (UTC) From: Kevin Traynor To: Luca Boccassi Cc: Thomas Monjalon , Shahaf Shuler , dpdk stable Date: Thu, 29 Nov 2018 13:20:20 +0000 Message-Id: <20181129132128.7609-20-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 29 Nov 2018 13:22:20 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fallback quietly if pkg-config is unavailable' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 13:22:21 -0000 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 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 Signed-off-by: Luca Boccassi Acked-by: Shahaf Shuler --- 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 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@dpdk.org Reported-by: Thomas Monjalon Signed-off-by: Luca Boccassi @@ -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)