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 15B7843CAD for ; Thu, 14 Mar 2024 01:10:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E513040297; Thu, 14 Mar 2024 01:10:02 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 3E15E4021E for ; Thu, 14 Mar 2024 01:10:01 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-413eae3e60fso3011775e9.0 for ; Wed, 13 Mar 2024 17:10:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375001; x=1710979801; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EFTD0qk1n1Qt1b+KIVTrrbFwRlEQ+G4p6mx9USM8axE=; b=YusrgvGe/un4m1beAr4WBWLI00SFF8OiqAjT2RNdjLRJYw1y9NfvOuzUyRBgmeaRD1 NGhkGu81cu5BWelhqgBGLbDin8wlxT+9CAHBSVJOa2tqld3o6ewgicqX0JosVLakHnAE baKQQRA0ev6tp0l2ltx9X8uFcPDCPSTtGiRECMB7ZQXccQIhMtYo9XN/55fGtNmDwUDg CLtrDBmyijmf6vdCq77jhEpyEpx5Vo4pNrdpJBCh/Nua8H8gne5I5zbhPw7IbAw53z/O zTBb/AEWmSjZ1b9DBShiR8gKT5Z6l3/g9VTBiQzdSZAwDjyE7eFHqKvxFLNpZTPNpV3X bSaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375001; x=1710979801; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EFTD0qk1n1Qt1b+KIVTrrbFwRlEQ+G4p6mx9USM8axE=; b=aHgf9cCDlDwdEiIP546Qwt0SbGvTUuEWAVfXLULsO/v+y/3G83qsTt3sZJb+Z6uYCP F+efh5h5MgIv83ibg8jvjUdJfO5Eqnt2ZdUnqNm4r65G1fyPFdJP6rHYlw9BMg+f5ZuK XElJuYAIITyYjypFQe9P5i5gKMAtFnXn8m4QCzMM6j/JEYm9YNAA4dyEYkwgcKXWy0BZ mn9iiSGbM1GMMv1JNZqHPopgta4PkRrARy0SsO77x0LFJoWpIFnfhIGBeBsrJ+vviRAu yJduQRgfsL3v1qzUkufxnt3naBEp2Djc+OnxODfBOlvfwzKS8fB5mBRC69BluFS2IVeI cCvQ== X-Forwarded-Encrypted: i=1; AJvYcCVVOsWvsK/Ypm7y5Q2aLa2NacRLE/Wd4pkxFyW8upqO036AjGP8T8gPdPZW8Q6qgY+Uj4JnYsWZUBYEt89OV7I= X-Gm-Message-State: AOJu0YwKurp59qi/pXCpI+YriJxEyOQzds30XbANjH8bVy3ECPbGseSi 9OHFVeGTZY37r7uSUatDGJqwW2kT+EpXJi/BNMcklHRTa2+bA6gy X-Google-Smtp-Source: AGHT+IG3S4OZf4W6CliNtk+C7jEsFlwO7b1P1A0vNeh08UGnRYMhdVsoXki6POe+PLZP9XUTvPmuJw== X-Received: by 2002:a05:600c:3d19:b0:413:1dae:dcdd with SMTP id bh25-20020a05600c3d1900b004131daedcddmr186625wmb.6.1710375000497; Wed, 13 Mar 2024 17:10:00 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id u19-20020a05600c19d300b004101f27737asm3775245wmq.29.2024.03.13.17.09.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:09:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Kevin Traynor Cc: Luca Boccassi , dpdk stable Subject: patch 'Revert "build: add libarchive to optional external' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:08:57 +0000 Message-Id: <20240314000957.2810803-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-102-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 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 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 Acked-by: Luca Boccassi --- 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 ') cflags += '-DRTE_LIBEAL_USE_GETENTROPY' endif -- 2.39.2