From patchwork Wed Jan 9 17:18:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatoly Burakov X-Patchwork-Id: 49554 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A97971B589; Wed, 9 Jan 2019 18:18:18 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id E4A901B586; Wed, 9 Jan 2019 18:18:16 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jan 2019 09:18:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,458,1539673200"; d="scan'208";a="105274734" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga007.jf.intel.com with ESMTP; 09 Jan 2019 09:18:14 -0800 Received: from sivswdev05.ir.intel.com (sivswdev05.ir.intel.com [10.243.17.64]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id x09HID5S017782; Wed, 9 Jan 2019 17:18:13 GMT Received: from sivswdev05.ir.intel.com (localhost [127.0.0.1]) by sivswdev05.ir.intel.com with ESMTP id x09HIDZR024162; Wed, 9 Jan 2019 17:18:13 GMT Received: (from aburakov@localhost) by sivswdev05.ir.intel.com with LOCAL id x09HIBb1024158; Wed, 9 Jan 2019 17:18:12 GMT From: Anatoly Burakov To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, david.marchand@redhat.com, stable@dpdk.org Date: Wed, 9 Jan 2019 17:18:11 +0000 Message-Id: <98ec658513d481f8d22c8b438cc3fedc4a718d3f.1547054251.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 1.7.0.7 Subject: [dpdk-dev] [PATCH] eal: move compat includes to common meson file X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently, while EAL does depend on librte_compat as far as common meson build is concerned, for some reason the headers for that library are not added into the list of includes. This is fixed in Linuxapp-specific meson file, but is absent from FreeBSD meson file. This worked fine up until recently, when an rte_compat dependency was added to rte_log, which is a common header. Fix this issue by adding librte_compat includes to common EAL meson file. Fixes: 844514c73569 ("eal: build with meson") Fixes: a8499f65a1d1 ("log: add missing experimental tag") Cc: bruce.richardson@intel.com Cc: david.marchand@redhat.com Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov Reviewed-by: David Marchand --- lib/librte_eal/linuxapp/eal/meson.build | 2 +- lib/librte_eal/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/eal/meson.build b/lib/librte_eal/linuxapp/eal/meson.build index 6e31c2aaa..7e68b2c0d 100644 --- a/lib/librte_eal/linuxapp/eal/meson.build +++ b/lib/librte_eal/linuxapp/eal/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -eal_inc += include_directories('include', '../../../librte_compat') +eal_inc += include_directories('include') install_subdir('include/exec-env', install_dir: get_option('includedir')) env_objs = [] diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index a18f3a826..67e26de8d 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -4,7 +4,7 @@ # Custom EAL processing. EAL is complicated enough that it can't just # have a straight list of headers and source files. # Initially pull in common settings -eal_inc = [global_inc] +eal_inc = [global_inc, include_directories('../librte_compat')] subdir('common') # defines common_sources, common_objs, etc. # Now do OS/exec-env specific settings, including building kernel modules