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 05C03A04DB for ; Tue, 17 Nov 2020 12:14:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F3D0D5928; Tue, 17 Nov 2020 12:14:31 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by dpdk.org (Postfix) with ESMTP id 6D17B5916 for ; Tue, 17 Nov 2020 12:14:29 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id p1so22723304wrf.12 for ; Tue, 17 Nov 2020 03:14:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=y8Q2Ushxd0c5B3Ei3fgcVXr11n07Vj+HJF0jRWB06+g=; b=KpYOrNeBvRoXNdfa5RWNxxl39v0VAtcvsp3ua+f0Yzopsu2dlM03X5+iU7yfF0nOZQ iHAp5a/4s9vRjlDXjZNIJ4iYOxvo/P7AzqNMigp6CIBfn8hTpu/HT8Ipqgy+6qEgJZ7O eZsJLKgBaYUKrYPRO7Wxe0KFLyttZKj25I/HGsPEAEocBgA6xWR5tWpblaaMkLmGmLOn 3H/IyF6vP6Dg8mqdjabuyfR1M6/OWo64nvKChR+mFIVc2mc68F2PlWEiKjuG/gg38YJ/ 4UAeB4C+nYoag6Zd8ZJiIG2thDg6YQSdbJ0rJbem9AtBcn4Viw72ZXXim3R5g//865yr 7DIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=y8Q2Ushxd0c5B3Ei3fgcVXr11n07Vj+HJF0jRWB06+g=; b=RhHf3mdnVBP4IRUa2CrvK9y+jIXIrz8V6W270PxdiUTFThS3mR+id2iYA1y7Nq7SIk Un4BGcdU/WFTdH7yG39J/+KUckJpysTb+gu/qaD5yT+/PbAP3W9PahtsKP8KtoP0gc8r g2C/PY01lTO3U2c+Qh/TskeHmDBPmlsoOfBNn+xLN1IwjkrVve7e/OLcl4ZeG6nwyJ0/ 62mbTErE9T86y8p9wmrHElqalxarBn6Mva1bjJu1LK5C39j3kdeRKsm6PI4+mVaqmx9b M0lXGR+QfnWcXdHy2JQFYoS9CF6nosAPsPgnHk2paTgjgDUO6En5gEsQFNjnb0TA8ZSG T/zQ== X-Gm-Message-State: AOAM533cRbELWfEsNJCvfBUhNOepu8rXnjvORZqOyjLGUJMRxwq2AD/E TweudVjl2h0+mtKQ22BcJCu1KfAv7Dt33A== X-Google-Smtp-Source: ABdhPJwN8eBKBSJ5F7NLp27NbY5WDNrCSEfK9k2AXZlsIbAiJ2Ew0WOuv1Tsh++cRTFKSWEl/uAwgw== X-Received: by 2002:a5d:4fc1:: with SMTP id h1mr25889679wrw.226.1605611668223; Tue, 17 Nov 2020 03:14:28 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u7sm3450991wmb.20.2020.11.17.03.14.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:14:27 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: dpdk stable Date: Tue, 17 Nov 2020 11:13:38 +0000 Message-Id: <20201117111416.1961049-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/l2fwd-keepalive: skip meson build if no librt' has been queued to stable release 19.11.6 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 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 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 @@ -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@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