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 05D1DA04B5 for ; Tue, 3 Dec 2019 19:28:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EBF2B1BE80; Tue, 3 Dec 2019 19:28:32 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id E657B1BE80 for ; Tue, 3 Dec 2019 19:28:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397711; 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: in-reply-to:in-reply-to:references:references; bh=kTao6VigFgVXo61ZMU3Ef5QWr0bdnxeuO+IlIxALuPo=; b=E6hTj+bOOV9PSjXK/EzNSIVwtcVAlHWolEanyWtIVxQqvQQsw58HxojiFbD+hjTM8vC3vJ bGiswb6xjUY9yl1tEkp2/Xj92eibYFTSlAcxJJiDHj0gV9AoBCeFAH+MAf80BAROHUbCgN AqTOm1ehbh28SZ3WrX2+KRzFGW/X8Co= 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-284-kNgvf6FPMZqacFgqBN4L8w-1; Tue, 03 Dec 2019 13:28:28 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 07D38107ACC4; Tue, 3 Dec 2019 18:28:27 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64E6A5C240; Tue, 3 Dec 2019 18:28:24 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Jan Remes , dpdk stable Date: Tue, 3 Dec 2019 18:26:39 +0000 Message-Id: <20191203182714.17297-30-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: kNgvf6FPMZqacFgqBN4L8w-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/szedata2: fix dependency check' has been queued to LTS release 18.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 LTS release 18.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 12/10/19. 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 rebasi= ng (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/ad84f96f137acdbcba= 0383a0b5ffecc804502732 Thanks. Kevin. --- >From ad84f96f137acdbcba0383a0b5ffecc804502732 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Sat, 14 Sep 2019 11:37:00 +0200 Subject: [PATCH] net/szedata2: fix dependency check [ upstream commit 07737474ece260fc4adbc46a0b2e7352887fa0c2 ] The library libsze2 provides a pkg-config file: libsze2.pc. Looking for this .pc file - with dependency() - is preferred than looking for the library - with cc.find_library(). If the library is not installed in a standard path, it can be found thanks to PKG_CONFIG_PATH variable. The previous solution required to use CFLAGS and LDFLAGS environment variables. Fixes: 508cfe6be9f1 ("net/szedata2: add to meson build") Signed-off-by: Thomas Monjalon Acked-by: Jan Remes --- drivers/net/szedata2/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.= build index da3733743..a64d38fa0 100644 --- a/drivers/net/szedata2/meson.build +++ b/drivers/net/szedata2/meson.build @@ -2,5 +2,5 @@ # Copyright(c) 2018 Intel Corporation =20 -dep =3D cc.find_library('sze2', required: false) +dep =3D dependency('libsze2', required: false) build =3D dep.found() ext_deps +=3D dep --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:53.566254345 +0000 +++ 0030-net-szedata2-fix-dependency-check.patch=092019-12-03 17:29:51.7497= 49974 +0000 @@ -1 +1 @@ -From 07737474ece260fc4adbc46a0b2e7352887fa0c2 Mon Sep 17 00:00:00 2001 +From ad84f96f137acdbcba0383a0b5ffecc804502732 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 07737474ece260fc4adbc46a0b2e7352887fa0c2 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 032b42518..b53fcbc59 100644 +index da3733743..a64d38fa0 100644 @@ -34 +35 @@ - reason =3D 'missing dependency, "libsze2"' + ext_deps +=3D dep