From: Kevin Traynor <ktraynor@redhat.com>
To: stable@dpdk.org, xuemingl@nvidia.com, bluca@debian.org
Cc: bruce.richardson@intel.com, david.marchand@redhat.com,
tredaelli@redhat.com, Kevin Traynor <ktraynor@redhat.com>
Subject: [PATCH 22.11] Revert "build: add libarchive to optional external dependencies"
Date: Mon, 19 Feb 2024 11:22:04 +0000 [thread overview]
Message-ID: <20240219112204.15483-1-ktraynor@redhat.com> (raw)
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@redhat.com>
---
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 5f6320ab19..265aaa995c 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -210,4 +210,9 @@ 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
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
@@ -30,7 +30,4 @@ 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'
--
2.43.0
next reply other threads:[~2024-02-19 11:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-19 11:22 Kevin Traynor [this message]
2024-02-19 11:34 ` Bruce Richardson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240219112204.15483-1-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=bluca@debian.org \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=stable@dpdk.org \
--cc=tredaelli@redhat.com \
--cc=xuemingl@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).