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 E5CE11B459 for ; Thu, 31 Jan 2019 16:49:54 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55479A7DD; Thu, 31 Jan 2019 15:49:54 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-200.ams2.redhat.com [10.36.117.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 19DBF5C207; Thu, 31 Jan 2019 15:49:52 +0000 (UTC) From: Kevin Traynor To: Luca Boccassi Cc: dpdk stable Date: Thu, 31 Jan 2019 15:48:21 +0000 Message-Id: <20190131154901.5383-13-ktraynor@redhat.com> In-Reply-To: <20190131154901.5383-1-ktraynor@redhat.com> References: <20190131154901.5383-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 31 Jan 2019 15:49:54 +0000 (UTC) Subject: [dpdk-stable] patch 'build: use static deps for pkg-config libs.private' has been queued to LTS release 18.11.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, 31 Jan 2019 15:49:55 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.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 02/07/19. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Kevin Traynor --- >>From 1d39413aa5625b4b2ce6925f383b323d52497ae2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 11 Jan 2019 16:12:44 +0000 Subject: [PATCH] build: use static deps for pkg-config libs.private [ upstream commit d3588176716e6f8733a2534d7d3ab0dec8e550ec ] Dependencies of the RTE libraries were not being added to the Requires.private field of the pc file since the variable used for dynamic linking was passed to the related field of pkg.generate. Use the static one so that dependencies are included. Fixes: 57ae0ec62620 ("build: add dependency on telemetry to apps with meson") Signed-off-by: Luca Boccassi --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4122be83d..636626ae5 100644 --- a/meson.build +++ b/meson.build @@ -82,5 +82,5 @@ pkg.generate(name: meson.project_name(), version: meson.project_version(), libraries: dpdk_libraries, - libraries_private: dpdk_drivers + dpdk_libraries + + libraries_private: dpdk_drivers + dpdk_static_libraries + ['-Wl,-Bdynamic'] + dpdk_extra_ldflags, description: 'The Data Plane Development Kit (DPDK)', -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-31 15:44:06.052132104 +0000 +++ 0013-build-use-static-deps-for-pkg-config-libs.private.patch 2019-01-31 15:44:05.000000000 +0000 @@ -1,15 +1,16 @@ -From d3588176716e6f8733a2534d7d3ab0dec8e550ec Mon Sep 17 00:00:00 2001 +From 1d39413aa5625b4b2ce6925f383b323d52497ae2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Fri, 11 Jan 2019 16:12:44 +0000 Subject: [PATCH] build: use static deps for pkg-config libs.private +[ upstream commit d3588176716e6f8733a2534d7d3ab0dec8e550ec ] + Dependencies of the RTE libraries were not being added to the Requires.private field of the pc file since the variable used for dynamic linking was passed to the related field of pkg.generate. Use the static one so that dependencies are included. Fixes: 57ae0ec62620 ("build: add dependency on telemetry to apps with meson") -Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- @@ -17,7 +18,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 7cee3c94a..617e88589 100644 +index 4122be83d..636626ae5 100644 --- a/meson.build +++ b/meson.build @@ -82,5 +82,5 @@ pkg.generate(name: meson.project_name(),