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 C268729C6 for ; Tue, 20 Nov 2018 20:15:17 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 33A593082A49; Tue, 20 Nov 2018 19:15:17 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28D48600C3; Tue, 20 Nov 2018 19:15:15 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Luca Boccassi , dpdk stable Date: Tue, 20 Nov 2018 19:12:27 +0000 Message-Id: <20181120191252.30277-37-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 20 Nov 2018 19:15:17 +0000 (UTC) Subject: [dpdk-stable] patch 'compat: fix symbol version support with meson' 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: Tue, 20 Nov 2018 19:15:18 -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/23/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 79e26dd3b25320a7f7c794628fbfda575e7777f3 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 17 Sep 2018 09:18:00 +0100 Subject: [PATCH] compat: fix symbol version support with meson [ upstream commit 7a9eac097443fcd9f7fd3a1dd4ca86d46a2e09b9 ] For meson builds, the define to enable the symbol version macros in rte_compat.h was missing. This led to symbols being omitted from shared objects. For example, checking rte_distributor.so with objdump and comparing make and meson built versions: $ objdump -T make-build/lib/librte_distributor.so | grep _flush 0000000000001b60 g DF .text 00000000000000a7 (DPDK_2.0) rte_distributor_flush 0000000000003f10 g DF .text 0000000000000434 DPDK_17.05 rte_distributor_flush $ objdump -T meson-build/lib/librte_distributor.so | grep _flush 0000000000001d50 g DF .text 00000000000000fb DPDK_2.0 rte_distributor_flush Adding in the missing define fixes this. Fixes: 5b9656b157d3 ("lib: build with meson") Reported-by: Luca Boccassi Signed-off-by: Bruce Richardson Tested-by: Luca Boccassi --- config/rte_config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/rte_config.h b/config/rte_config.h index a8e479774..46775a841 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -21,4 +21,7 @@ /****** library defines ********/ +/* compat defines */ +#define RTE_BUILD_SHARED_LIB + /* EAL defines */ #define RTE_MAX_MEMSEG_LISTS 128 -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.355171005 +0000 +++ 0037-compat-fix-symbol-version-support-with-meson.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,8 +1,10 @@ -From 7a9eac097443fcd9f7fd3a1dd4ca86d46a2e09b9 Mon Sep 17 00:00:00 2001 +From 79e26dd3b25320a7f7c794628fbfda575e7777f3 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 17 Sep 2018 09:18:00 +0100 Subject: [PATCH] compat: fix symbol version support with meson +[ upstream commit 7a9eac097443fcd9f7fd3a1dd4ca86d46a2e09b9 ] + For meson builds, the define to enable the symbol version macros in rte_compat.h was missing. This led to symbols being omitted from shared objects. For example, checking rte_distributor.so @@ -17,7 +19,6 @@ Adding in the missing define fixes this. Fixes: 5b9656b157d3 ("lib: build with meson") -Cc: stable@dpdk.org Reported-by: Luca Boccassi Signed-off-by: Bruce Richardson