From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2A189A04B1 for ; Mon, 23 Nov 2020 18:12:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F1E6EC8E4; Mon, 23 Nov 2020 18:12:42 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id DEE20C8E4 for ; Mon, 23 Nov 2020 18:12:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OtpmESCSPCQmC45oGgZkCLunNMR/8koyL7/JvAHg3Lk=; b=hrNsx/D2vVwSVjsDQZlq5ar4vk3Ce8Ios1MAvjda1uONU0XpyHEk5NaAUhNkALQyq90Vft rfwyW3EM8j07R2Q+jNbG6lGClAuidRQ55grRsJep5Iei0tfTakGZH4bhllMvfD0supC/SG EKh08d8t4ZnEIID8jAFoEKYb3oCKdp8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-570-iSR8ktNeOpW0kKtvUgdhyA-1; Mon, 23 Nov 2020 12:12:33 -0500 X-MC-Unique: iSR8ktNeOpW0kKtvUgdhyA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 694FB100A641; Mon, 23 Nov 2020 17:12:32 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96D8060C04; Mon, 23 Nov 2020 17:12:31 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: dpdk stable Date: Mon, 23 Nov 2020 17:11:53 +0000 Message-Id: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to LTS release 18.11.11 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 --- 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@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