patch 'Revert "build: add libarchive to optional external' has been queued to stable release 22.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.5

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/16/24. 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/ab4db7ac79be3adad655725cebcab8a69b4167ba

Thanks.

Luca Boccassi

---
>From ab4db7ac79be3adad655725cebcab8a69b4167ba Mon Sep 17 00:00:00 2001
From: Kevin Traynor <ktraynor at redhat.com>
Date: Mon, 19 Feb 2024 11:22:04 +0000
Subject: [PATCH] Revert "build: add libarchive to optional external
 dependencies"

This reverts commit dec4b39b200a8c4b835f018c6061e81597e9401c.

This patch is reverting the 22.11 backport of upstream commit
22f7184e8b5f ("build: add libarchive to optional external dependencies")

Bruce highlighted [0] that this patch changes dependencies and exposes
some issues with libarchive packages, which leads to link errors.

We should not change the dependencies on already released LTS.

[0]
https://mails.dpdk.org/archives/stable/2023-November/046434.html

Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
Acked-by: Luca Boccassi <bluca at debian.org>
---
 config/meson.build  | 5 +++++
 lib/eal/meson.build | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/meson.build b/config/meson.build
index a5445d5fc4..25e41b57d6 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -212,6 +212,11 @@ dpdk_conf.set('RTE_BACKTRACE', cc.has_header('execinfo.h') or is_windows)
 libarchive = dependency('libarchive', required: false, method: 'pkg-config')
 if libarchive.found()
     dpdk_conf.set('RTE_HAS_LIBARCHIVE', 1)
+    # Push libarchive link dependency at the project level to support
+    # statically linking dpdk apps. Details at:
+    # https://inbox.dpdk.org/dev/20210605004024.660267a1@sovereign/
+    add_project_link_arguments('-larchive', language: 'c')
+    dpdk_extra_ldflags += '-larchive'
 endif
 
 # check for libbsd
diff --git a/lib/eal/meson.build b/lib/eal/meson.build
index 04bd3fe351..056beb9461 100644
--- a/lib/eal/meson.build
+++ b/lib/eal/meson.build
@@ -29,9 +29,6 @@ endif
 if dpdk_conf.has('RTE_USE_LIBBSD')
     ext_deps += libbsd
 endif
-if dpdk_conf.has('RTE_HAS_LIBARCHIVE')
-    ext_deps += libarchive
-endif
 if cc.has_function('getentropy', prefix : '#include <unistd.h>')
     cflags += '-DRTE_LIBEAL_USE_GETENTROPY'
 endif
-- 
2.39.2