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 CCB0B43345 for ; Thu, 16 Nov 2023 14:25:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A68240EDF; Thu, 16 Nov 2023 14:25:05 +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 2836540ED1 for ; Thu, 16 Nov 2023 14:25:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141102; 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: in-reply-to:in-reply-to:references:references; bh=3G0nmRTniqJOuWNu6clvsIEN7JC1mVbpBJ8QcxVZx4E=; b=QnscO8AUSMmmbGmRYNSanxwg081FR+zHMRhlLXi3jzIU/bHbTOU3p12mwkbmUZSRAPpEpv 7DRICiX/Ac/OBgY0FO9rDDSaGy2BDohszZqQ19CGDxiR5be7V9j6x9bP6PUEPYx00wVRlM celwVXAGmjJHuy49oE1XB8WtgsQaLXE= 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-696-eabUlgjvMQ6chE8SzF3Vbg-1; Thu, 16 Nov 2023 08:24:56 -0500 X-MC-Unique: eabUlgjvMQ6chE8SzF3Vbg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 EC51382A661; Thu, 16 Nov 2023 13:24:55 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 363DB2166B27; Thu, 16 Nov 2023 13:24:55 +0000 (UTC) From: Kevin Traynor To: Srikanth Yalavarthi Cc: Bruce Richardson , dpdk stable Subject: patch 'build: add libarchive to optional external dependencies' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:25 +0000 Message-ID: <20231116132348.557257-43-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 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 Hi, FYI, your patch has been queued to stable release 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/23. 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/aa40722948ac2dc15f93b8598f560029c757b645 Thanks. Kevin --- >From aa40722948ac2dc15f93b8598f560029c757b645 Mon Sep 17 00:00:00 2001 From: Srikanth Yalavarthi Date: Sun, 5 Nov 2023 20:12:43 -0800 Subject: [PATCH] build: add libarchive to optional external dependencies [ upstream commit 22f7184e8b5f1b546ac26dd0bde8c3c6038a7e03 ] In order to avoid linking with Libs.private, libarchive is not added to ext_deps during the meson setup stage. Since libarchive is not added to ext_deps, cross-compilation or native compilation with libarchive installed in non-standard location fails with errors related to "cannot find -larchive" or "archive.h: No such file or directory". In order to fix the build failures, user is required to define the 'c_args' and 'c_link_args' with '-I' and '-L'. This patch adds libarchive to ext_deps and further would not require setting c_args and c_link_args externally. Fixes: 40edb9c0d36b ("eal: handle compressed firmware") Signed-off-by: Srikanth Yalavarthi Acked-by: Bruce Richardson --- config/meson.build | 5 ----- lib/eal/meson.build | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build index a79a3ed39c..b40302da02 100644 --- a/config/meson.build +++ b/config/meson.build @@ -208,9 +208,4 @@ 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 1722924f67..f223c6d7a5 100644 --- a/lib/eal/meson.build +++ b/lib/eal/meson.build @@ -23,4 +23,7 @@ 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.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.587627939 +0000 +++ 0043-build-add-libarchive-to-optional-external-dependenci.patch 2023-11-16 13:21:52.506946538 +0000 @@ -1 +1 @@ -From 22f7184e8b5f1b546ac26dd0bde8c3c6038a7e03 Mon Sep 17 00:00:00 2001 +From aa40722948ac2dc15f93b8598f560029c757b645 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 22f7184e8b5f1b546ac26dd0bde8c3c6038a7e03 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 39ed4ba7d3..d732154731 100644 +index a79a3ed39c..b40302da02 100644 @@ -33 +34 @@ -@@ -252,9 +252,4 @@ libarchive = dependency('libarchive', required: false, method: 'pkg-config') +@@ -208,9 +208,4 @@ libarchive = dependency('libarchive', required: false, method: 'pkg-config') @@ -44 +45 @@ -index 9942104386..e1d6c4cf17 100644 +index 1722924f67..f223c6d7a5 100644 @@ -47 +48 @@ -@@ -22,4 +22,7 @@ if dpdk_conf.has('RTE_USE_LIBBSD') +@@ -23,4 +23,7 @@ if dpdk_conf.has('RTE_USE_LIBBSD')