build/windows: remove separate list of libs

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>

diff --git a/lib/acl/meson.build b/lib/acl/meson.build
index fbb13182307f762735d61ec404708da078849831..f3dc513846f978056378b5022c377b91ff0455e0 100644 (file)
--- 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 2969cab26b26a582e500abf91fd014d3401ef188..07685e75783bbc9e4e2cb0516d4ccf7b3f8600a8 100644 (file)
--- 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 07e5494a8cb810feb5a7976e3c139b269fbbfd43..33b506f3ac1a70bf92a3214c96aac66a1844b3b3 100644 (file)
--- 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_dump.c',
         'bpf_exec.c',

diff --git a/lib/compressdev/meson.build b/lib/compressdev/meson.build
index 663ceec0b9d7e93a6440230801dcd3979852ffae..75ea666a9bec4b252aa3b765fe940f308ce13b05 100644 (file)
--- 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 cefe1b9f193a6fc2fcd1753c96e25d26623ef5c0..24988c5827c50e70a43aba432d1695a8c1f3ce6d 100644 (file)
--- 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 07fb1c29a755d531cbc497a7dda86380bfa5a649..343f14e1f3bc15fdb7112cf2e41a83bdf161ffcf 100644 (file)
--- 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 abe88f733ae124b7b44f2034c756f8b8ed8f5be9..6b2c381811792c306c05ebf91539c9b5136dd749 100644 (file)
--- 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 5618c215a7a38aa9d430180d0b90429978111473..593c8c47c8e3cafd1e0db1c8c9525e4e1a4beb1b 100644 (file)
--- 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 a7a5b3d577a71d2b5458774df9665e2e6975bf21..3bb861c68fb59847ddd7483661358843e52226b8 100644 (file)
--- 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 6befb094d263b3ca3a8be7fe76fdeaee969095ca..c7327549e83bcab4db97aefc05597371c17ca951 100644 (file)
--- 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 ea2de09f7528a2b6f72a6095f3f252c462b82860..3a252bdaf6a4ccd19793887a51a76dca085c6ccd 100644 (file)
--- 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 ddb9ea1767db87f1bde074b1f28c6e92e6abdaa8..0b8b935cd2eae856160c98e2efa42c65cefed744 100644 (file)
--- 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',
                 'ipsec_telemetry.c')

diff --git a/lib/jobstats/meson.build b/lib/jobstats/meson.build
index 391e4f802ec4032ce169e684407fee2b755c14cf..6da2a95b759e02a5966f7c7e212c7ae7a8c92cf6 100644 (file)
--- 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 e2e4e44fc6a7bec79e01f82739d8dd9acc3385da..8a71d8ba6f652a3bb5d460224b5a90a5490a3445 100644 (file)
--- 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 5ca54815e4400271cfaf48d2f373c76d02cbcddf..78d91d34216102661d45527371aa9dc96759dd34 100644 (file)
--- 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 0e6b34c4065d0dba65ff9be95ffc4ab051de81ab..e06fddc2400d12a98654492b62b9732670a3572e 100644 (file)
--- 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 fa8541bca29f87342154459111f9b736ee01dcce..499d26060fddcc980a770ee02a95883c5ae64b5f 100644 (file)
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -64,35 +64,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',
-            '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 230aa6fa0f005d21d49ed7d69fc411aedbca9245..dbdf673c86cf67a14d353c78b2d5c5e26ccc0222 100644 (file)
--- 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/pcapng/meson.build b/lib/pcapng/meson.build
index 4549925d41b6614d94f6f386b51cba7102aee822..da938bbcb733e920264da09bbb3f212c37441626 100644 (file)
--- a/lib/pcapng/meson.build
+++ b/lib/pcapng/meson.build
@@ -1,6 +1,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2019 Microsoft Corporation
 
+if is_windows
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
+endif
+
 sources = files('rte_pcapng.c')
 headers = files('rte_pcapng.h')
 

diff --git a/lib/pdump/meson.build b/lib/pdump/meson.build
index 51ceb2afdec544f4202194614bff12963ef817d3..da8d51b616a3e1c01ddec73f1c0aa181f724d6ec 100644 (file)
--- a/lib/pdump/meson.build
+++ b/lib/pdump/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_pdump.c')
 headers = files('rte_pdump.h')
 deps += ['ethdev', 'bpf', 'pcapng']

diff --git a/lib/pipeline/meson.build b/lib/pipeline/meson.build
index 9132bb517a30218a5c3e12b64ed509624978aca4..3ca98ed194cdad0d564017f7645fd777cc37fb57 100644 (file)
--- 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 289bc47f6e322e554d155b90ea974319cd10a8ac..854bf39cd9a6ef3d8ef20d834bf70e18df8f63e5 100644 (file)
--- 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 bf937acde44c9c6249de5167e33fc403ec7fd535..ba8d66074beba754c9ddaa78d7b2b4ea685e64c7 100644 (file)
--- 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 30d363cd2dcf2ac8aa0f3e925424cb0cfb82f2ec..7dfc3d5cf94aac628c2d232123111da4d59b8d81 100644 (file)
--- 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 7e12d8cd6d09ed66eb8643e1df350f6001d68ca1..426e764eced067745ca74307b2074b42bf8f8860 100644 (file)
--- 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 03aed53d9007d1017606523b63b62bf792baaa10..621c1f35010357717cc70d5002bf7ea88a3debaf 100644 (file)
--- 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 7bacbb45359293446b352ae2a8624b307ee917e7..bda7f576e9768a124e7f9aab0cc0504bd7e66f70 100644 (file)
--- 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 b24f7b8775fc742f35690d52e29f5f7b3066698f..8ced4547aac5e9f36d73d2e8c27637439ea11550 100644 (file)
--- 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 ac1f1aac270e0ca9ca0d4b692824fc7ed3b97501..d1f2f9dcf6ead39c43954cdbf678feaaed796ce6 100644 (file)
--- 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',