From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id EE15CA0C43;
Wed, 20 Oct 2021 13:26:23 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 4E19A411F2;
Wed, 20 Oct 2021 13:26:16 +0200 (CEST)
Received: from mga07.intel.com (mga07.intel.com [134.134.136.100])
by mails.dpdk.org (Postfix) with ESMTP id 216A041196
for <dev@dpdk.org>; Wed, 20 Oct 2021 13:26:14 +0200 (CEST)
X-IronPort-AV: E=McAfee;i="6200,9189,10142"; a="292219496"
X-IronPort-AV: E=Sophos;i="5.87,166,1631602800"; d="scan'208";a="292219496"
Received: from fmsmga006.fm.intel.com ([10.253.24.20])
by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
20 Oct 2021 04:26:14 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.87,166,1631602800"; d="scan'208";a="718920592"
Received: from silpixa00399126.ir.intel.com ([10.237.223.151])
by fmsmga006.fm.intel.com with ESMTP; 20 Oct 2021 04:26:08 -0700
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, dmitry.kozliuk@gmail.com,
navasile@linux.microsoft.com, dmitrym@microsoft.com,
pallavi.kadam@intel.com, Bruce Richardson <bruce.richardson@intel.com>,
Konstantin Ananyev <konstantin.ananyev@intel.com>,
Nicolas Chautru <nicolas.chautru@intel.com>,
Fiona Trahe <fiona.trahe@intel.com>,
Ashish Gupta <ashish.gupta@marvell.com>, David Hunt <david.hunt@intel.com>,
Byron Marohn <byron.marohn@intel.com>,
Yipeng Wang <yipeng1.wang@intel.com>, Jerin Jacob <jerinj@marvell.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>,
Bernard Iremonger <bernard.iremonger@intel.com>,
Kiran Kumar K <kirankumark@marvell.com>,
Nithin Dabilpuram <ndabilpuram@marvell.com>,
Ferruh Yigit <ferruh.yigit@intel.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Pavan Nikhilesh <pbhagavatula@marvell.com>,
Cristian Dumitrescu <cristian.dumitrescu@intel.com>,
Nipun Gupta <nipun.gupta@nxp.com>, Hemant Agrawal <hemant.agrawal@nxp.com>,
Ori Kam <orika@nvidia.com>, Reshma Pattan <reshma.pattan@intel.com>,
Jasvinder Singh <jasvinder.singh@intel.com>
Date: Wed, 20 Oct 2021 12:25:54 +0100
Message-Id: <20211020112554.2421080-4-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20211020112554.2421080-1-bruce.richardson@intel.com>
References: <20211019161537.2414549-1-bruce.richardson@intel.com>
<20211020112554.2421080-1-bruce.richardson@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v2 3/3] build/windows: remove separate list of
libs
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Rather than maintaining a separate list of libraries which are to be
built on windows, use the standard library list and explicitly add to
each library that is not to be built a check for windows and disable
the library at that per-lib level. As well as shortening the main
lib/meson.build file, this also leads to the build summary at the end of
the meson config run correctly listing the libraries which are not to be
built.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
NOTE: no attempt was made to add additional libraries to the windows,
build. This patch was generated by an automated script run using the
lists of libraries for windows/non-windows builds.
---
lib/acl/meson.build | 6 ++++++
lib/bbdev/meson.build | 6 ++++++
lib/bpf/meson.build | 6 ++++++
lib/compressdev/meson.build | 6 ++++++
lib/distributor/meson.build | 6 ++++++
lib/efd/meson.build | 6 ++++++
lib/eventdev/meson.build | 6 ++++++
lib/fib/meson.build | 6 ++++++
lib/flow_classify/meson.build | 6 ++++++
lib/graph/meson.build | 6 ++++++
lib/ip_frag/meson.build | 6 ++++++
lib/ipsec/meson.build | 6 ++++++
lib/jobstats/meson.build | 6 ++++++
lib/kni/meson.build | 6 ++++++
lib/lpm/meson.build | 6 ++++++
lib/member/meson.build | 6 ++++++
lib/meson.build | 30 ------------------------------
lib/node/meson.build | 6 ++++++
lib/pipeline/meson.build | 6 ++++++
lib/port/meson.build | 6 ++++++
lib/power/meson.build | 6 ++++++
lib/rawdev/meson.build | 6 ++++++
lib/regexdev/meson.build | 6 ++++++
lib/reorder/meson.build | 6 ++++++
lib/rib/meson.build | 6 ++++++
lib/sched/meson.build | 6 ++++++
lib/table/meson.build | 6 ++++++
27 files changed, 156 insertions(+), 30 deletions(-)
diff --git a/lib/acl/meson.build b/lib/acl/meson.build
index fbb1318230..f3dc513846 100644
--- a/lib/acl/meson.build
+++ b/lib/acl/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('acl_bld.c', 'acl_gen.c', 'acl_run_scalar.c',
'rte_acl.c', 'tb_mem.c')
headers = files('rte_acl.h', 'rte_acl_osdep.h')
diff --git a/lib/bbdev/meson.build b/lib/bbdev/meson.build
index 2969cab26b..07685e7578 100644
--- a/lib/bbdev/meson.build
+++ b/lib/bbdev/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_bbdev.c')
headers = files('rte_bbdev.h',
'rte_bbdev_pmd.h',
diff --git a/lib/bpf/meson.build b/lib/bpf/meson.build
index 63cbd60185..eb94bf18c4 100644
--- a/lib/bpf/meson.build
+++ b/lib/bpf/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('bpf.c',
'bpf_exec.c',
'bpf_load.c',
diff --git a/lib/compressdev/meson.build b/lib/compressdev/meson.build
index 663ceec0b9..75ea666a9b 100644
--- a/lib/compressdev/meson.build
+++ b/lib/compressdev/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_compressdev.c',
'rte_compressdev_pmd.c',
'rte_comp.c')
diff --git a/lib/distributor/meson.build b/lib/distributor/meson.build
index cefe1b9f19..24988c5827 100644
--- a/lib/distributor/meson.build
+++ b/lib/distributor/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_distributor.c', 'rte_distributor_single.c')
if arch_subdir == 'x86'
sources += files('rte_distributor_match_sse.c')
diff --git a/lib/efd/meson.build b/lib/efd/meson.build
index 07fb1c29a7..343f14e1f3 100644
--- a/lib/efd/meson.build
+++ b/lib/efd/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_efd.c')
headers = files('rte_efd.h')
deps += ['ring', 'hash']
diff --git a/lib/eventdev/meson.build b/lib/eventdev/meson.build
index 32abeba794..bf7cf82eee 100644
--- a/lib/eventdev/meson.build
+++ b/lib/eventdev/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
if is_linux
cflags += '-DLINUX'
else
diff --git a/lib/fib/meson.build b/lib/fib/meson.build
index 5618c215a7..593c8c47c8 100644
--- a/lib/fib/meson.build
+++ b/lib/fib/meson.build
@@ -2,6 +2,12 @@
# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com>
# Copyright(c) 2019 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ 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/flow_classify/meson.build b/lib/flow_classify/meson.build
index a7a5b3d577..3bb861c68f 100644
--- a/lib/flow_classify/meson.build
+++ b/lib/flow_classify/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_flow_classify.c', 'rte_flow_classify_parse.c')
headers = files('rte_flow_classify.h')
deps += ['net', 'table']
diff --git a/lib/graph/meson.build b/lib/graph/meson.build
index 6befb094d2..c7327549e8 100644
--- a/lib/graph/meson.build
+++ b/lib/graph/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(C) 2020 Marvell International Ltd.
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'node.c',
'graph.c',
diff --git a/lib/ip_frag/meson.build b/lib/ip_frag/meson.build
index ea2de09f75..3a252bdaf6 100644
--- a/lib/ip_frag/meson.build
+++ b/lib/ip_frag/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'rte_ipv4_fragmentation.c',
'rte_ipv6_fragmentation.c',
diff --git a/lib/ipsec/meson.build b/lib/ipsec/meson.build
index 1497f573bb..531a97f143 100644
--- a/lib/ipsec/meson.build
+++ b/lib/ipsec/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('esp_inb.c', 'esp_outb.c', 'sa.c', 'ses.c', 'ipsec_sad.c')
headers = files('rte_ipsec.h', 'rte_ipsec_sa.h', 'rte_ipsec_sad.h')
diff --git a/lib/jobstats/meson.build b/lib/jobstats/meson.build
index 391e4f802e..6da2a95b75 100644
--- a/lib/jobstats/meson.build
+++ b/lib/jobstats/meson.build
@@ -1,5 +1,11 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_jobstats.c')
headers = files('rte_jobstats.h')
diff --git a/lib/kni/meson.build b/lib/kni/meson.build
index e2e4e44fc6..8a71d8ba6f 100644
--- a/lib/kni/meson.build
+++ b/lib/kni/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
build = false
reason = 'only supported on 64-bit Linux'
diff --git a/lib/lpm/meson.build b/lib/lpm/meson.build
index 5ca54815e4..78d91d3421 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_windows
+ build = false
+ reason = 'not supported on Windows'
+ 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/member/meson.build b/lib/member/meson.build
index 0e6b34c406..e06fddc240 100644
--- a/lib/member/meson.build
+++ b/lib/member/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_member.c', 'rte_member_ht.c', 'rte_member_vbf.c')
headers = files('rte_member.h')
deps += ['hash']
diff --git a/lib/meson.build b/lib/meson.build
index 403b1f4aa4..c1bf2385a0 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -63,36 +63,6 @@ libraries = [
'node',
]
-if is_windows
- libraries = [
- 'kvargs',
- 'telemetry',
- 'eal',
- 'ring',
- 'rcu',
- 'mempool',
- 'mbuf',
- 'net',
- 'meter',
- 'ethdev',
- 'dmadev',
- 'pci',
- 'cmdline',
- 'metrics',
- 'hash',
- 'timer',
- 'bitratestats',
- 'cryptodev',
- 'cfgfile',
- 'gro',
- 'gso',
- 'latencystats',
- 'pdump',
- 'stack',
- 'security',
- ] # only supported libraries for windows
-endif
-
optional_libs = [
'kni',
'power',
diff --git a/lib/node/meson.build b/lib/node/meson.build
index 230aa6fa0f..dbdf673c86 100644
--- a/lib/node/meson.build
+++ b/lib/node/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(C) 2020 Marvell International Ltd.
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'ethdev_ctrl.c',
'ethdev_rx.c',
diff --git a/lib/pipeline/meson.build b/lib/pipeline/meson.build
index 9132bb517a..3ca98ed194 100644
--- a/lib/pipeline/meson.build
+++ b/lib/pipeline/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'rte_pipeline.c',
'rte_port_in_action.c',
diff --git a/lib/port/meson.build b/lib/port/meson.build
index 289bc47f6e..854bf39cd9 100644
--- a/lib/port/meson.build
+++ b/lib/port/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'rte_port_ethdev.c',
'rte_port_fd.c',
diff --git a/lib/power/meson.build b/lib/power/meson.build
index bf937acde4..ba8d66074b 100644
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
if not is_linux
build = false
reason = 'only supported on Linux'
diff --git a/lib/rawdev/meson.build b/lib/rawdev/meson.build
index 30d363cd2d..7dfc3d5cf9 100644
--- a/lib/rawdev/meson.build
+++ b/lib/rawdev/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_rawdev.c')
headers = files('rte_rawdev.h', 'rte_rawdev_pmd.h')
diff --git a/lib/regexdev/meson.build b/lib/regexdev/meson.build
index 7e12d8cd6d..426e764ece 100644
--- a/lib/regexdev/meson.build
+++ b/lib/regexdev/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright 2020 Mellanox Technologies, Ltd
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_regexdev.c')
headers = files('rte_regexdev.h', 'rte_regexdev_driver.h')
indirect_headers += files('rte_regexdev_core.h')
diff --git a/lib/reorder/meson.build b/lib/reorder/meson.build
index 03aed53d90..621c1f3501 100644
--- a/lib/reorder/meson.build
+++ b/lib/reorder/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_reorder.c')
headers = files('rte_reorder.h')
deps += ['mbuf']
diff --git a/lib/rib/meson.build b/lib/rib/meson.build
index 7bacbb4535..bda7f576e9 100644
--- a/lib/rib/meson.build
+++ b/lib/rib/meson.build
@@ -2,6 +2,12 @@
# Copyright(c) 2018 Vladimir Medvedkin <medvedkinv@gmail.com>
# Copyright(c) 2019 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_rib.c', 'rte_rib6.c')
headers = files('rte_rib.h', 'rte_rib6.h')
deps += ['mempool']
diff --git a/lib/sched/meson.build b/lib/sched/meson.build
index b24f7b8775..8ced4547aa 100644
--- a/lib/sched/meson.build
+++ b/lib/sched/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files('rte_sched.c', 'rte_red.c', 'rte_approx.c')
headers = files(
'rte_approx.h',
diff --git a/lib/table/meson.build b/lib/table/meson.build
index ac1f1aac27..d1f2f9dcf6 100644
--- a/lib/table/meson.build
+++ b/lib/table/meson.build
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
+if is_windows
+ build = false
+ reason = 'not supported on Windows'
+ subdir_done()
+endif
+
sources = files(
'rte_swx_table_em.c',
'rte_swx_table_learner.c',
--
2.30.2