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 20BE3A0093 for ; Thu, 10 Mar 2022 13:12:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1BD6641142; Thu, 10 Mar 2022 13:12:03 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 853C041142 for ; Thu, 10 Mar 2022 13:12:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646914321; 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=7XFve6tTp7wZALsUowWg+grjGWKiU4Sy7n4Qu0KydsY=; b=G36Gkk98+aaJO0MBHFC7+C+8ButQquzfUyNe6WS1YnHSZHAjiAFWXCOT5hKHaccq4n+gKD FQkyZXfXL4fNwrZFcc0/zI4ddi6N8sFaTzu9LJa95BqWo3liUAHqjt5+uxyqIgb1RNTIZe qcCT7bOxmS8Y5EyB8YEXxmXW77SQ/DQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-382-p9t1To2YPkKJjS3DS9Y_cA-1; Thu, 10 Mar 2022 07:11:57 -0500 X-MC-Unique: p9t1To2YPkKJjS3DS9Y_cA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6AFCF801AB2; Thu, 10 Mar 2022 12:11:56 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F15483079; Thu, 10 Mar 2022 12:11:54 +0000 (UTC) From: Kevin Traynor To: Karl Bonde Torp Cc: Bruce Richardson , dpdk stable Subject: patch 'build: fix build on FreeBSD with Meson 0.61.1' has been queued to stable release 21.11.1 Date: Thu, 10 Mar 2022 12:11:09 +0000 Message-Id: <20220310121127.1324802-3-ktraynor@redhat.com> In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com> References: <20220310121127.1324802-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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" 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/14/22. 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/0c7cbe52f76963a6d8f6466fc077a9c0cb695b37 Thanks. Kevin --- >From 0c7cbe52f76963a6d8f6466fc077a9c0cb695b37 Mon Sep 17 00:00:00 2001 From: Karl Bonde Torp Date: Mon, 14 Feb 2022 12:43:13 +0100 Subject: [PATCH] build: fix build on FreeBSD with Meson 0.61.1 [ upstream commit 4bab7ea60c25332e53ded18b7b101d37442b21b3 ] When building with Meson 0.61.1 on FreeBSD some archives become corrupted. This can be avoided by using 'llvm-ar' instead of 'ar'. Signed-off-by: Karl Bonde Torp Acked-by: Bruce Richardson --- buildtools/meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buildtools/meson.build b/buildtools/meson.build index 400b88f251..e1c600e40f 100644 --- a/buildtools/meson.build +++ b/buildtools/meson.build @@ -32,4 +32,7 @@ if host_machine.system() == 'windows' endif pmdinfogen += 'coff' +elif host_machine.system() == 'freebsd' + pmdinfo += 'llvm-ar' + pmdinfogen += 'elf' else pmdinfo += 'ar' -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-10 12:05:31.530643533 +0000 +++ 0010-build-fix-build-on-FreeBSD-with-Meson-0.61.1.patch 2022-03-10 12:05:31.244630715 +0000 @@ -1 +1 @@ -From 4bab7ea60c25332e53ded18b7b101d37442b21b3 Mon Sep 17 00:00:00 2001 +From 0c7cbe52f76963a6d8f6466fc077a9c0cb695b37 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 4bab7ea60c25332e53ded18b7b101d37442b21b3 ] + @@ -8,2 +9,0 @@ - -Cc: stable@dpdk.org