From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 428594326F for ; Thu, 2 Nov 2023 14:14:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3CDF342DA3; Thu, 2 Nov 2023 14:14:01 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 30A8242DCA for ; Thu, 2 Nov 2023 14:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930838; 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=owtkWdqGo88p3mUEh4fI13XPD7DNNQYsDltY2lD2fjc=; b=UJES5qSb3QoMjTgedp0JYsPVNAehI2NQpUHqBgkkxHUZ8BvvTq4DE7AD52TJ1ub3eZKfiL rMLohNC2DzuVurA8xwbZB7pujzVPdd48fQdiYBphAruPPtd5dhLu1irff9TA37L/Pgj5li oimEqmKsmk5y/Cvr6S2RGuM+kTPJOVs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-483-HxKAqR5ANhCMshsPc6Rung-1; Thu, 02 Nov 2023 09:13:55 -0400 X-MC-Unique: HxKAqR5ANhCMshsPc6Rung-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4452885A59D; Thu, 2 Nov 2023 13:13:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id DDA68492BFA; Thu, 2 Nov 2023 13:13:53 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Ciara Power , dpdk stable Subject: patch 'crypto/ipsec_mb: add dependency check for cross build' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:38 +0000 Message-ID: <20231102131254.315947-32-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.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/08/23. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/27a64dc2dd4083a2b9465b6ddf82d7e3064db73e Thanks. Kevin --- >From 27a64dc2dd4083a2b9465b6ddf82d7e3064db73e Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 31 Aug 2023 13:10:57 +0100 Subject: [PATCH] crypto/ipsec_mb: add dependency check for cross build [ upstream commit fb94d8243894524316d872c8299b9e793832d991 ] When cross-compiling for PowerPC on Ubuntu, the x86 IPSec_MB library was getting found by the build system for use in the PPC build. This led to failures at compile time due to the library not being linkable. We can avoid these failures by checking the discovered library for compatibility at configuration time. This needs a version check as it is supported only from version 0.60 of meson onwards. Fixes: c75542ae4200 ("crypto/ipsec_mb: introduce IPsec_mb framework") Signed-off-by: Bruce Richardson Acked-by: Ciara Power --- drivers/crypto/ipsec_mb/meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build index a89b29d6c3..e6448532bd 100644 --- a/drivers/crypto/ipsec_mb/meson.build +++ b/drivers/crypto/ipsec_mb/meson.build @@ -13,4 +13,9 @@ if not lib.found() build = false reason = 'missing dependency, "libIPSec_MB"' +# if the lib is found, check it's the right format +elif meson.version().version_compare('>=0.60') and not cc.links( + 'int main(void) {return 0;}', dependencies: lib) + build = false + reason = 'incompatible dependency, "libIPSec_MB"' else ext_deps += lib -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.658616276 +0000 +++ 0032-crypto-ipsec_mb-add-dependency-check-for-cross-build.patch 2023-11-02 13:09:40.834163403 +0000 @@ -1 +1 @@ -From fb94d8243894524316d872c8299b9e793832d991 Mon Sep 17 00:00:00 2001 +From 27a64dc2dd4083a2b9465b6ddf82d7e3064db73e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fb94d8243894524316d872c8299b9e793832d991 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 3057e6fd10..87bf965554 100644 +index a89b29d6c3..e6448532bd 100644 @@ -27 +28 @@ -@@ -17,4 +17,9 @@ if not lib.found() +@@ -13,4 +13,9 @@ if not lib.found()