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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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/19/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/298d935b92572c57f0c410969823c88fb9235d54

Thanks.

Luca Boccassi

---
>From 298d935b92572c57f0c410969823c88fb9235d54 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
@@ -6,7 +6,13 @@
 # To build this example as a standalone application with an already-installed
 # 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(
 	'main.c', 'shm.c'
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-17 11:13:13.166107706 +0000
+++ 0004-examples-l2fwd-keepalive-skip-meson-build-if-no-libr.patch	2020-11-17 11:13:12.861115401 +0000
@@ -1 +1 @@
-From b334236abd8dfeea625525de548b35b40cb68c3b Mon Sep 17 00:00:00 2001
+From 298d935b92572c57f0c410969823c88fb9235d54 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 @@
-@@ -7,7 +7,13 @@
+@@ -6,7 +6,13 @@
+ # To build this example as a standalone application with an already-installed
@@ -26 +27,0 @@
- allow_experimental_apis = true