patches for DPDK stable branches
 help / color / Atom feed
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: bluca@debian.org, stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH v2] build: skip detecting libpcap via pcap-config
Date: Mon, 12 Oct 2020 13:48:14 +0100
Message-ID: <20201012124814.GD565@bricha3-MOBL.ger.corp.intel.com> (raw)
In-Reply-To: <20201009141914.205284-1-bruce.richardson@intel.com>

+CC stable for consideration

On Fri, Oct 09, 2020 at 03:19:14PM +0100, Bruce Richardson wrote:
> 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.
> 

CC: stable@dpdk.org

> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  config/meson.build | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/config/meson.build b/config/meson.build
> index 69f2aeb60..9fb903c9b 100644
> --- a/config/meson.build
> +++ b/config/meson.build
> @@ -163,11 +163,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.25.1
> 

       reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20201008170536.124111-1-bruce.richardson@intel.com>
     [not found] ` <20201009141914.205284-1-bruce.richardson@intel.com>
2020-10-12 12:48   ` Bruce Richardson [this message]
     [not found]   ` <b72ca9072454c65075fe695597d65eb7e08fc7f6.camel@debian.org>
2020-10-12 15:12     ` [dpdk-stable] [dpdk-dev] " David Marchand

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201012124814.GD565@bricha3-MOBL.ger.corp.intel.com \
    --to=bruce.richardson@intel.com \
    --cc=bluca@debian.org \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox