From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 77199A0548; Fri, 2 Apr 2021 02:55:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7B18D141022; Fri, 2 Apr 2021 02:54:53 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id D281114100E for ; Fri, 2 Apr 2021 02:54:50 +0200 (CEST) IronPort-SDR: 0C4kYLdMDuUjlsyAKe6/BcvLOXOQCBikimiAjDJFSCJIZwZURidVqwZVp41J3ghrwNx5w8DUvA VcuPGV0PSFUA== X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="172394107" X-IronPort-AV: E=Sophos;i="5.81,298,1610438400"; d="scan'208";a="172394107" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 17:54:43 -0700 IronPort-SDR: IbhkYjEQJDIo3jHzKYa5DQ8LSUpqQ0K4MD7qbSDH10N0Xm3oSkBBEQk7ArkYBLRHTeHgfkqBIV 4PSzAfPNUXVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,298,1610438400"; d="scan'208";a="412947668" Received: from win-dpdk-pallavi.jf.intel.com (HELO localhost.localdomain) ([10.166.188.111]) by fmsmga008.fm.intel.com with ESMTP; 01 Apr 2021 17:54:40 -0700 From: Pallavi Kadam To: dev@dpdk.org, thomas@monjalon.net Cc: dmitry.kozliuk@gmail.com, ranjit.menon@intel.com, qiming.yang@intel.com, qi.z.zhang@intel.com, ferruh.yigit@intel.com, pallavi.kadam@intel.com Date: Thu, 1 Apr 2021 18:26:19 -0700 Message-Id: <20210402012621.7944-2-pallavi.kadam@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20210402012621.7944-1-pallavi.kadam@intel.com> References: <20210311015848.4976-1-pallavi.kadam@intel.com> <20210402012621.7944-1-pallavi.kadam@intel.com> Subject: [dpdk-dev] [PATCH v3 1/3] build: enable iavf base code to build on windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Enable IAVF driver to build on Windows as it is required to build ice PMD. Disable all other drivers from common directory. This patch also includes fix for a macro redefinition warning in the IAVF driver. Signed-off-by: Pallavi Kadam Reviewed-by: Ranjit Menon Acked-by: Jie Zhou --- drivers/common/cpt/meson.build | 6 ++++++ drivers/common/iavf/iavf_osdep.h | 9 +++++++++ drivers/common/meson.build | 3 --- drivers/common/mvep/meson.build | 6 ++++++ drivers/common/octeontx/meson.build | 6 ++++++ drivers/common/octeontx2/meson.build | 6 ++++++ drivers/common/qat/meson.build | 6 ++++++ 7 files changed, 39 insertions(+), 3 deletions(-) diff --git a/drivers/common/cpt/meson.build b/drivers/common/cpt/meson.build index beecf0da3..1127267ba 100644 --- a/drivers/common/cpt/meson.build +++ b/drivers/common/cpt/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium, Inc +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files('cpt_fpm_tables.c', 'cpt_pmd_ops_helper.c') diff --git a/drivers/common/iavf/iavf_osdep.h b/drivers/common/iavf/iavf_osdep.h index eaefde88e..76c186a5b 100644 --- a/drivers/common/iavf/iavf_osdep.h +++ b/drivers/common/iavf/iavf_osdep.h @@ -55,6 +55,15 @@ typedef uint64_t s64; #define __be64 uint64_t #endif +/* Avoid macro redefinition warning on Windows */ +#ifdef RTE_EXEC_ENV_WINDOWS +#ifdef min +#undef min +#endif +#ifdef max +#undef max +#endif +#endif #define min(a, b) RTE_MIN(a, b) #define max(a, b) RTE_MAX(a, b) diff --git a/drivers/common/meson.build b/drivers/common/meson.build index 66e12143b..438302e76 100644 --- a/drivers/common/meson.build +++ b/drivers/common/meson.build @@ -1,9 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium, Inc -if is_windows - subdir_done() -endif std_deps = ['eal'] drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2'] diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build index 7cd968b38..a929e2311 100644 --- a/drivers/common/mvep/meson.build +++ b/drivers/common/mvep/meson.build @@ -4,6 +4,12 @@ # All rights reserved. # +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + dep = dependency('libmusdk', required: false, method: 'pkg-config') if not dep.found() build = false diff --git a/drivers/common/octeontx/meson.build b/drivers/common/octeontx/meson.build index 203d1ef49..02b57b95c 100644 --- a/drivers/common/octeontx/meson.build +++ b/drivers/common/octeontx/meson.build @@ -2,4 +2,10 @@ # Copyright(c) 2018 Cavium, Inc # +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + sources = files('octeontx_mbox.c') diff --git a/drivers/common/octeontx2/meson.build b/drivers/common/octeontx2/meson.build index 84fb11524..97293d1a7 100644 --- a/drivers/common/octeontx2/meson.build +++ b/drivers/common/octeontx2/meson.build @@ -2,6 +2,12 @@ # Copyright(C) 2019 Marvell International Ltd. # +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + if not dpdk_conf.get('RTE_ARCH_64') build = false reason = 'only supported on 64-bit' diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build index 67f7aca97..3ad7dd501 100644 --- a/drivers/common/qat/meson.build +++ b/drivers/common/qat/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2018 Intel Corporation +if is_windows + build = false + reason = 'not supported on Windows' + subdir_done() +endif + qat_crypto = true qat_crypto_path = 'crypto/qat' qat_crypto_relpath = '../../' + qat_crypto_path -- 2.18.0.windows.1