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 744DC43DEF; Wed, 3 Apr 2024 20:23:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 03FAF402D1; Wed, 3 Apr 2024 20:23:25 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 2FFC64025D for ; Wed, 3 Apr 2024 20:23:22 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 7E6FB20E8CBF; Wed, 3 Apr 2024 11:23:21 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 7E6FB20E8CBF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1712168601; bh=vevWLFzPp9LbttIpoudu5EZ+OPIju/2YS30xr6Eo6TE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rn/mDSsW6XUTSNZOajS9wypETOI3a/F5KZ260FX1TnipghJS49Ah/fHzE11VTvCyA 9Y3F3S6UsT9nU8vC2pvau7cX15hUbOyW/C1tFSzyLOv8J6z24qRkt/zvLP8zhwpUBH JlAtBggMbl/hdET32fM8d9paHc0Fg8gLvH4DfoIA= From: Tyler Retzlaff To: dev@dpdk.org Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , Andrew Rybchenko , Bruce Richardson , Chengwen Feng , Honnappa Nagarahalli , Kevin Laatz , Srikanth Yalavarthi , Vladimir Medvedkin , Tyler Retzlaff Subject: [PATCH v2] build: exclude rather than include libs in MSVC build Date: Wed, 3 Apr 2024 11:23:20 -0700 Message-Id: <1712168600-17289-2-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1712168600-17289-1-git-send-email-roretzla@linux.microsoft.com> References: <1712076948-25853-1-git-send-email-roretzla@linux.microsoft.com> <1712168600-17289-1-git-send-email-roretzla@linux.microsoft.com> 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 Some libraries that could be built with MSVC were not being built. Switch from explicit include to exclude of libs to get immediate CI coverage of libraries that already work with MSVC Windows builds. Signed-off-by: Tyler Retzlaff Acked-by: Stephen Hemminger --- lib/argparse/meson.build | 6 ++++++ lib/dmadev/meson.build | 6 ++++++ lib/fib/meson.build | 6 ++++++ lib/lpm/meson.build | 6 ++++++ lib/mbuf/meson.build | 6 ++++++ lib/mempool/meson.build | 6 ++++++ lib/meson.build | 10 ---------- lib/mldev/meson.build | 6 ++++++ lib/rcu/meson.build | 6 ++++++ lib/stack/meson.build | 6 ++++++ 10 files changed, 54 insertions(+), 10 deletions(-) diff --git a/lib/argparse/meson.build b/lib/argparse/meson.build index b6a08ca..8ab4c40 100644 --- a/lib/argparse/meson.build +++ b/lib/argparse/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2024 HiSilicon Limited. +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + sources = files('rte_argparse.c') headers = files('rte_argparse.h') diff --git a/lib/dmadev/meson.build b/lib/dmadev/meson.build index 62b0650..e66dcb6 100644 --- a/lib/dmadev/meson.build +++ b/lib/dmadev/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2021 HiSilicon Limited. +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + sources = files('rte_dmadev.c', 'rte_dmadev_trace_points.c') headers = files('rte_dmadev.h') indirect_headers += files('rte_dmadev_core.h', 'rte_dmadev_trace_fp.h') diff --git a/lib/fib/meson.build b/lib/fib/meson.build index ddcae06..6795f41 100644 --- a/lib/fib/meson.build +++ b/lib/fib/meson.build @@ -2,6 +2,12 @@ # Copyright(c) 2018 Vladimir Medvedkin # Copyright(c) 2019 Intel Corporation +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + sources = files('rte_fib.c', 'rte_fib6.c', 'dir24_8.c', 'trie.c') headers = files('rte_fib.h', 'rte_fib6.h') deps += ['rib'] diff --git a/lib/lpm/meson.build b/lib/lpm/meson.build index 4cd4888..ae30f80 100644 --- a/lib/lpm/meson.build +++ b/lib/lpm/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + sources = files('rte_lpm.c', 'rte_lpm6.c') headers = files('rte_lpm.h', 'rte_lpm6.h') # since header files have different names, we can install all vector headers diff --git a/lib/mbuf/meson.build b/lib/mbuf/meson.build index 0435c5e..2cee905 100644 --- a/lib/mbuf/meson.build +++ b/lib/mbuf/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + sources = files( 'rte_mbuf.c', 'rte_mbuf_ptype.c', diff --git a/lib/mempool/meson.build b/lib/mempool/meson.build index 8099a56..acce66c 100644 --- a/lib/mempool/meson.build +++ b/lib/mempool/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + extra_flags = [] foreach flag: extra_flags diff --git a/lib/meson.build b/lib/meson.build index 179a272..94d2b72 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -68,16 +68,6 @@ libraries = [ 'node', ] -if is_ms_compiler - libraries = [ - 'log', - 'kvargs', - 'telemetry', - 'eal', - 'ring', - ] -endif - always_enable = [ 'cmdline', 'eal', diff --git a/lib/mldev/meson.build b/lib/mldev/meson.build index 0079ccd..2c933ba 100644 --- a/lib/mldev/meson.build +++ b/lib/mldev/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (c) 2022 Marvell. +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + sources = files( 'rte_mldev_pmd.c', 'rte_mldev.c', diff --git a/lib/rcu/meson.build b/lib/rcu/meson.build index 09abc52..71143f5 100644 --- a/lib/rcu/meson.build +++ b/lib/rcu/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Arm Limited +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + sources = files('rte_rcu_qsbr.c') headers = files('rte_rcu_qsbr.h') diff --git a/lib/stack/meson.build b/lib/stack/meson.build index 18177a7..7631a14 100644 --- a/lib/stack/meson.build +++ b/lib/stack/meson.build @@ -1,6 +1,12 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Intel Corporation +if is_ms_compiler + build = false + reason = 'not supported building with Visual Studio Toolset' + subdir_done() +endif + sources = files('rte_stack.c', 'rte_stack_std.c', 'rte_stack_lf.c') headers = files('rte_stack.h') # subheaders, not for direct inclusion by apps -- 1.8.3.1