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 99D10A04B1 for ; Thu, 5 Nov 2020 13:42:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 911A8C806; Thu, 5 Nov 2020 13:42:17 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id EE56FC806 for ; Thu, 5 Nov 2020 13:42:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580133; 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=SF4Afrug9d9dP4d1LfcAJ0ztbVk/8hcc/Fsl2gdgM24=; b=R0PFDcYq5Jvo5DPFHa8kU0MwKRojnWw7ETcR6BB5cH4ayNtEtEltNqpEEYnMUtA1zXDI5a T7JuvrzsZDoX0IefcebsDGUa8pVNbQ2IQFQyhvBJKVrjuRN+JbiK7A4+z5n2n++hBzCX4a E4CxeO11J45c+5E5eqpEuTQr+j1WwKQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-532-8scGLrFNPqGpAQWqkrBHGQ-1; Thu, 05 Nov 2020 07:42:11 -0500 X-MC-Unique: 8scGLrFNPqGpAQWqkrBHGQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F1E381074643; Thu, 5 Nov 2020 12:42:09 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4C425C662; Thu, 5 Nov 2020 12:42:08 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Luca Boccassi , David Marchand , dpdk stable Date: Thu, 5 Nov 2020 12:40:03 +0000 Message-Id: <20201105124015.306404-56-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'build: skip detecting libpcap via pcap-config' has been queued to LTS release 18.11.11 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 LTS release 18.11.11 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/10/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/6a3788ef9de98a10758a80e451325b581edee5ca Thanks. Kevin. --- >From 6a3788ef9de98a10758a80e451325b581edee5ca 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 3b7fad67d7..28a87c5394 100644 --- a/config/meson.build +++ b/config/meson.build @@ -91,9 +91,7 @@ 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 -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.396171679 +0000 +++ 0056-build-skip-detecting-libpcap-via-pcap-config.patch 2020-11-05 12:38:54.255896031 +0000 @@ -1 +1 @@ -From cce5aecf3c3ce30724e4686bf867f146dd2fb625 Mon Sep 17 00:00:00 2001 +From 6a3788ef9de98a10758a80e451325b581edee5ca Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cce5aecf3c3ce30724e4686bf867f146dd2fb625 ] + @@ -17,2 +18,0 @@ -Cc: stable@dpdk.org - @@ -27 +27 @@ -index 69f2aeb605..9fb903c9ba 100644 +index 3b7fad67d7..28a87c5394 100644 @@ -30 +30 @@ -@@ -164,9 +164,7 @@ endif +@@ -91,9 +91,7 @@ endif