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 009D243B2D for ; Mon, 19 Feb 2024 12:22:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EF80240289; Mon, 19 Feb 2024 12:22:18 +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 501F140275 for ; Mon, 19 Feb 2024 12:22:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708341736; 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; bh=eatXfQAKLYd76OzGr8n9ZDFsTqu+D4bTnadVGpUtlQk=; b=SkwiNBhB16qtpOackC/iZEUVzNY9bn9h6phhqPc/iuV7jD5rX0G12/X+SfKUI3ZI/p8XHs rlR5aQxFQEvOqxIHbieusHh0o/oAxJBu3wU/5iiYQmWtnEfoSEsfSuNvVf3HI+TGni5W7j giWfSAhkqLTOxuXKQ+vn+vfGce7juZw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-164-W7TEsSXGMHCIZStaP3pylg-1; Mon, 19 Feb 2024 06:22:13 -0500 X-MC-Unique: W7TEsSXGMHCIZStaP3pylg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5E484185A787; Mon, 19 Feb 2024 11:22:13 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 39418492BE3; Mon, 19 Feb 2024 11:22:11 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org, xuemingl@nvidia.com, bluca@debian.org Cc: bruce.richardson@intel.com, david.marchand@redhat.com, tredaelli@redhat.com, Kevin Traynor Subject: [PATCH 22.11] Revert "build: add libarchive to optional external dependencies" Date: Mon, 19 Feb 2024 11:22:04 +0000 Message-ID: <20240219112204.15483-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 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 --- 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 ') cflags += '-DRTE_LIBEAL_USE_GETENTROPY' -- 2.43.0