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 EBC931B51D for ; Fri, 23 Nov 2018 11:29:33 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 52FFE3084244; Fri, 23 Nov 2018 10:29:33 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 92F02413C; Fri, 23 Nov 2018 10:29:31 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: Yongseok Koh , Luca Boccassi , dpdk stable Date: Fri, 23 Nov 2018 10:26:33 +0000 Message-Id: <20181123102713.17309-29-ktraynor@redhat.com> In-Reply-To: <20181123102713.17309-1-ktraynor@redhat.com> References: <20181123102713.17309-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 23 Nov 2018 10:29:33 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: use pkg-config to handle SUSE libmnl' 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: Fri, 23 Nov 2018 10:29:34 -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 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 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 Acked-by: Yongseok Koh Acked-by: Luca Boccassi --- 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 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@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Yongseok Koh @@ -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