From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id ECE3EA04DD for ; Wed, 28 Oct 2020 11:53:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E25C9CA06; Wed, 28 Oct 2020 11:53:15 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by dpdk.org (Postfix) with ESMTP id DAE80CA06 for ; Wed, 28 Oct 2020 11:53:13 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id i1so5198815wro.1 for ; Wed, 28 Oct 2020 03:53:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nx6bjUrFql+DWuU63P6y93+TXQ9y+ZrjUfAiQWN7FaA=; b=GVpcVF5X6ojrLUz31ZNZ1EPNMWzexNZRxQYQZEnL1m63xXHwhL7h/HPCjKCD7kmUPn Xj2S3jgBUH9VlWUG2Pbz3jp7yjF350RnDZqviQXfTVRrS3869AnR04QCDGaq6WTO3Hie WXlpaMTUIB+mA4pMu+c3O6wHEU5qQl5sBgEuqzEswPvRKpW/1axOqG+zLJ8NPktCBACV x2kRUa+lryAmQdiAbOQyrsD8H6kChdY6UcY0tkiktPZt0xWVOuMeLTEL3cph8GcJlVre CLgjfLznRs/OqTqby77UTLjXxcjJNPUZw21Kf4vbX0cmsKszPrfzMxs1uEMBuaUEZIvn fa2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nx6bjUrFql+DWuU63P6y93+TXQ9y+ZrjUfAiQWN7FaA=; b=E6ptlnz8n7mSDmzfrH20gL58IcHS/xewzDGpDKzXPcVb711oZnH1eNlz/fhBPxV3cM yW4H0wwN0wFcnxKP1kbPnOB6iOEuUezIEggLOrcLFHWGdimwqo0kkVgnShGJUggW5SgI FjArIAUbIaBAkUSY1nfozrtn5LjzGIfy5e8YTnibT23Uhj4+/hcWQLwgm60tGaVrauTi KwdjTZGPgWxaBheUL7KkK403lucMPZKfV7VhoYgExgpxY05G96D7MWbrq2E3beEGTD42 fCvaKfyAQb5hHkDHrTHZ92UREZxuGIdh6TT3P9ThYUuhK4ALRWwaSEIf1+mXLJfwlsKJ Pc2Q== X-Gm-Message-State: AOAM5335TjjK+bIZWVL6Gk8Am+hEm4p1j2Q+KazofCF1KM5l/7IZHBqD gv7+YRhFTcpArnkUhyq6XDc= X-Google-Smtp-Source: ABdhPJyUUZkPvsz0d2q+DyFfhgifPiSqEuy2BXRsCb+D1do1UL2hfaB8f4IFQxTQnwoIIZv+GHs1Xw== X-Received: by 2002:adf:bc4f:: with SMTP id a15mr3639073wrh.139.1603882392566; Wed, 28 Oct 2020 03:53:12 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o184sm5714618wmo.37.2020.10.28.03.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:53:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Luca Boccassi , David Marchand , dpdk stable Date: Wed, 28 Oct 2020 10:44:52 +0000 Message-Id: <20201028104606.3504127-133-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'build: skip detecting libpcap via pcap-config' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 10/30/20. 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. Thanks. Luca Boccassi --- >From 364bc27dfb965bac34446f3159c0befd8027e498 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 9 Oct 2020 15:19:14 +0100 Subject: [PATCH] build: skip detecting libpcap via pcap-config [ upstream commit cce5aecf3c3ce30724e4686bf867f146dd2fb625 ] When compiling for a slightly different architecture, e.g. 32-bit on 64-bit systems using CFLAGS rather than a cross-file, the pcap-config utility can often return parameters that are unusable for the build in question, i.e. providing the native 64-bit library paths rather than checking for 32-bit equivalent. Since many distros now include a version of libpcap with a pkg-config file, and for those that don't find-library should work ok as a fallback, we can explicitly just use pkg-config in the dependency search, causing meson to skip trying to use pcap-config. Signed-off-by: Bruce Richardson Reviewed-by: Luca Boccassi Tested-by: David Marchand --- config/meson.build | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build index 0a5e5b1c44..9afd05b95e 100644 --- a/config/meson.build +++ b/config/meson.build @@ -160,11 +160,9 @@ if libbsd.found() endif # check for pcap -pcap_dep = dependency('pcap', required: false) -if pcap_dep.found() - # pcap got a pkg-config file only in 1.9.0 and before that meson uses - # an internal pcap-config finder, which is not compatible with - # cross-compilation, so try to fallback to find_library +pcap_dep = dependency('libpcap', required: false, method: 'pkg-config') +if not pcap_dep.found() + # pcap got a pkg-config file only in 1.9.0 pcap_dep = cc.find_library('pcap', required: false) endif if pcap_dep.found() and cc.has_header('pcap.h', dependencies: pcap_dep) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.875825162 +0000 +++ 0133-build-skip-detecting-libpcap-via-pcap-config.patch 2020-10-28 10:35:11.704832968 +0000 @@ -1,8 +1,10 @@ -From cce5aecf3c3ce30724e4686bf867f146dd2fb625 Mon Sep 17 00:00:00 2001 +From 364bc27dfb965bac34446f3159c0befd8027e498 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 9 Oct 2020 15:19:14 +0100 Subject: [PATCH] build: skip detecting libpcap via pcap-config +[ upstream commit cce5aecf3c3ce30724e4686bf867f146dd2fb625 ] + When compiling for a slightly different architecture, e.g. 32-bit on 64-bit systems using CFLAGS rather than a cross-file, the pcap-config utility can often return parameters that are unusable for the build in question, i.e. @@ -14,8 +16,6 @@ fallback, we can explicitly just use pkg-config in the dependency search, causing meson to skip trying to use pcap-config. -Cc: stable@dpdk.org - Signed-off-by: Bruce Richardson Reviewed-by: Luca Boccassi Tested-by: David Marchand @@ -24,10 +24,10 @@ 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build -index 69f2aeb605..9fb903c9ba 100644 +index 0a5e5b1c44..9afd05b95e 100644 --- a/config/meson.build +++ b/config/meson.build -@@ -163,11 +163,9 @@ if libbsd.found() +@@ -160,11 +160,9 @@ if libbsd.found() endif # check for pcap