patch 'build: fix build on FreeBSD with Meson 0.61.1' has been queued to stable release 21.11.1

Kevin Traynor ktraynor at redhat.com
Thu Mar 10 13:11:09 CET 2022


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 <k.torp at samsung.com>
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 <k.torp at samsung.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 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 at dpdk.org



More information about the stable mailing list