Skip to content

Commit

Permalink
Revert "build: add libarchive to optional external dependencies"
Browse files Browse the repository at this point in the history
This reverts commit dec4b39.

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>
Acked-by: Luca Boccassi <bluca@debian.org>
  • Loading branch information
kevintraynor authored and bluca committed Mar 13, 2024
1 parent 782b5a2 commit ab4db7a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 5 additions & 0 deletions config/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions lib/eal/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit ab4db7a

Please sign in to comment.