From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A362AA0524 for ; Thu, 4 Feb 2021 12:36:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 82093240788; Thu, 4 Feb 2021 12:36:50 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 36E4824075D for ; Thu, 4 Feb 2021 12:36:49 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cwJ-0005WZ-9p; Thu, 04 Feb 2021 11:36:47 +0000 From: Christian Ehrhardt To: Bruce Richardson Cc: David Marchand , dpdk stable Date: Thu, 4 Feb 2021 12:28:56 +0100 Message-Id: <20210204112954.2488123-81-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app: fix build with extra include paths' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.7 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/06/21. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/2b5df8dcfb9cbbec84b5d751b84a905dd82fd672 Thanks. Christian Ehrhardt --- >From 2b5df8dcfb9cbbec84b5d751b84a905dd82fd672 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 15 Jan 2021 11:10:47 +0000 Subject: [PATCH] app: fix build with extra include paths [ upstream commit 64fd2124301eb246f12c316f9f619e36cf6d1bdc ] The "includes" variable in the app/meson.build file was ignored when building the executable, meaning that apps couldn't pass additional include paths directly back. Fix this to align with drivers and libs. Fixes: fa036e70d794 ("app: generalize meson build") Signed-off-by: Bruce Richardson Reviewed-by: David Marchand --- app/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/app/meson.build b/app/meson.build index 71109cc422..65d6bc7f85 100644 --- a/app/meson.build +++ b/app/meson.build @@ -62,6 +62,7 @@ foreach app:apps c_args: cflags, link_whole: link_libs, dependencies: dep_objs, + include_directories: includes, install_rpath: join_paths(get_option('prefix'), driver_install_path), install: true) -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:31.419986749 +0100 +++ 0081-app-fix-build-with-extra-include-paths.patch 2021-02-04 12:04:28.078789775 +0100 @@ -1 +1 @@ -From 64fd2124301eb246f12c316f9f619e36cf6d1bdc Mon Sep 17 00:00:00 2001 +From 2b5df8dcfb9cbbec84b5d751b84a905dd82fd672 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 64fd2124301eb246f12c316f9f619e36cf6d1bdc ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 903117b866..87fc195dbf 100644 +index 71109cc422..65d6bc7f85 100644 @@ -23,2 +24,2 @@ -@@ -66,6 +66,7 @@ foreach app:apps - link_args: ldflags, +@@ -62,6 +62,7 @@ foreach app:apps + c_args: cflags,