[dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.11

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/27/20. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8ad9970e4a5664ea3cb6806669f6058c63f36f4e

Thanks.

Kevin.

---
>From 8ad9970e4a5664ea3cb6806669f6058c63f36f4e Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Thu, 12 Nov 2020 09:41:40 +0000
Subject: [PATCH] examples/l2fwd-keepalive: skip meson build if no librt

[ upstream commit b334236abd8dfeea625525de548b35b40cb68c3b ]

When librt is not present on a system, processing the meson.build file
for this example application causes an error. Make the library
non-mandatory and just mark the example as unbuildable if it is
not present.

Fixes: 89f0711f9ddf ("examples: build some samples with meson")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
 examples/l2fwd-keepalive/meson.build | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/l2fwd-keepalive/meson.build b/examples/l2fwd-keepalive/meson.build
index 6f7b007e1e..aecc8d9fc9 100644
--- a/examples/l2fwd-keepalive/meson.build
+++ b/examples/l2fwd-keepalive/meson.build
@@ -7,5 +7,11 @@
 # DPDK instance, use 'make'
 
-ext_deps += cc.find_library('rt')
+librt = cc.find_library('rt', required: false)
+if not librt.found()
+	build = false
+	subdir_done()
+endif
+
+ext_deps += librt
 deps += 'timer'
 sources = files(
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-23 17:10:14.036381560 +0000
+++ 0001-examples-l2fwd-keepalive-skip-meson-build-if-no-libr.patch	2020-11-23 17:10:13.969061558 +0000
@@ -1 +1 @@
-From b334236abd8dfeea625525de548b35b40cb68c3b Mon Sep 17 00:00:00 2001
+From 8ad9970e4a5664ea3cb6806669f6058c63f36f4e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b334236abd8dfeea625525de548b35b40cb68c3b ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index d678a8ddd0..a56d679675 100644
+index 6f7b007e1e..aecc8d9fc9 100644
@@ -23 +24,2 @@
-@@ -8,5 +8,11 @@
+@@ -7,5 +7,11 @@
+ # DPDK instance, use 'make'
@@ -25 +26,0 @@
- allow_experimental_apis = true