From patchwork Thu Sep 27 13:24:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Babu Radhakrishnan, AgalyaX" X-Patchwork-Id: 45522 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 77F5C1B4CE; Thu, 27 Sep 2018 15:24:51 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id CE9921B4C5 for ; Thu, 27 Sep 2018 15:24:49 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Sep 2018 06:24:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,310,1534834800"; d="scan'208";a="76449723" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga007.jf.intel.com with ESMTP; 27 Sep 2018 06:24:35 -0700 Received: from wgcvswdev001.ir.intel.com (wgcvswdev001.ir.intel.com [10.102.246.100]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id w8RDOYIX012842; Thu, 27 Sep 2018 14:24:34 +0100 Received: from wgcvswdev001.ir.intel.com (localhost [127.0.0.1]) by wgcvswdev001.ir.intel.com with ESMTP id w8RDOLs7021200; Thu, 27 Sep 2018 14:24:21 +0100 Received: (from nsomarox@localhost) by wgcvswdev001.ir.intel.com with ? id w8RDOLDn021196; Thu, 27 Sep 2018 14:24:21 +0100 From: Agalya Babu RadhaKrishnan To: dev@dpdk.org Cc: alejandro.lucero@netronome.com, allain.legacy@windriver.com, jasvinder.singh@intel.com, keith.wiles@intel.com, matan@mellanox.com, bruce.richardson@intel.com, reshma.pattan@intel.com, Agalya Babu RadhaKrishnan Date: Thu, 27 Sep 2018 14:24:07 +0100 Message-Id: <1538054652-20820-2-git-send-email-agalyax.babu.radhakrishnan@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <1538054652-20820-1-git-send-email-agalyax.babu.radhakrishnan@intel.com> References: <1538054652-20820-1-git-send-email-agalyax.babu.radhakrishnan@intel.com> Subject: [dpdk-dev] [PATCH 1/6] build: fix for FREEBSD build via meson 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" FreeBSD compilation was failing through meson build. RTE_EAL_VFIO is not supported in FreeBSD. But RTE_EAL_VFIO was enabled for both linux and freebsd. So RTE_EAL_VFIO is removed from config/rte_config.h and based on the platform RTE_EAL_VFIO flag is enabled/disabled appropriately. Fixes: 6e8a721044 ("vfio: export functions even when disabled") Signed-off-by: Agalya Babu RadhaKrishnan --- config/rte_config.h | 1 - lib/meson.build | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config/rte_config.h b/config/rte_config.h index 567051b9c..53c568929 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -34,7 +34,6 @@ #define RTE_MAX_TAILQ 32 #define RTE_LOG_DP_LEVEL RTE_LOG_INFO #define RTE_BACKTRACE 1 -#define RTE_EAL_VFIO 1 #define RTE_MAX_VFIO_CONTAINERS 64 /* bsd module defines */ diff --git a/lib/meson.build b/lib/meson.build index 3acc67e6e..1b20027a5 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -31,6 +31,12 @@ if cc.has_argument('-Wno-format-truncation') default_cflags += '-Wno-format-truncation' endif +if host_machine.system() == 'linux' + dpdk_conf.set('RTE_EAL_VFIO', true) +else + dpdk_conf.set('RTE_EAL_VFIO', false) +endif + enabled_libs = [] # used to print summary at the end foreach l:libraries build = true