diff --git a/drivers/baseband/turbo_sw/meson.build b/drivers/baseband/turbo_sw/meson.build
index 55ef4e4ec7..477b8b371f 100644
--- a/drivers/baseband/turbo_sw/meson.build
+++ b/drivers/baseband/turbo_sw/meson.build
@@ -6,34 +6,34 @@ path = get_option('flexran_sdk')
 # check for FlexRAN SDK libraries for AVX2
 lib4g = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false)
 if lib4g.found()
-	ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
-	ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
-	ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
-	ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
-	ext_deps += cc.find_library('libstdc++', required: true)
-	ext_deps += cc.find_library('libirc', required: true)
-	ext_deps += cc.find_library('libimf', required: true)
-	ext_deps += cc.find_library('libipps', required: true)
-	ext_deps += cc.find_library('libsvml', required: true)
-	includes += include_directories(path + '/lib_turbo')
-	includes += include_directories(path + '/lib_crc')
-	includes += include_directories(path + '/lib_rate_matching')
-	includes += include_directories(path + '/lib_common')
-	cflags += ['-DRTE_BBDEV_SDK_AVX2']
+    ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true)
+    ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true)
+    ext_deps += cc.find_library('librate_matching', dirs: [path + '/lib_rate_matching'], required: true)
+    ext_deps += cc.find_library('libcommon', dirs: [path + '/lib_common'], required: true)
+    ext_deps += cc.find_library('libstdc++', required: true)
+    ext_deps += cc.find_library('libirc', required: true)
+    ext_deps += cc.find_library('libimf', required: true)
+    ext_deps += cc.find_library('libipps', required: true)
+    ext_deps += cc.find_library('libsvml', required: true)
+    includes += include_directories(path + '/lib_turbo')
+    includes += include_directories(path + '/lib_crc')
+    includes += include_directories(path + '/lib_rate_matching')
+    includes += include_directories(path + '/lib_common')
+    cflags += ['-DRTE_BBDEV_SDK_AVX2']
 endif
 
 # check for FlexRAN SDK libraries for AVX512
 lib5g = cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: false)
 if lib5g.found()
-	ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
-	ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
-	ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
-	ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
-	includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
-	includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
-	includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
-	includes += include_directories(path + '/lib_rate_dematching_5gnr')
-	cflags += ['-DRTE_BBDEV_SDK_AVX512']
+    ext_deps += cc.find_library('libldpc_encoder_5gnr', dirs: [path + '/lib_ldpc_encoder_5gnr'], required: true)
+    ext_deps += cc.find_library('libldpc_decoder_5gnr', dirs: [path + '/lib_ldpc_decoder_5gnr'], required: true)
+    ext_deps += cc.find_library('libLDPC_ratematch_5gnr', dirs: [path + '/lib_LDPC_ratematch_5gnr'], required: true)
+    ext_deps += cc.find_library('librate_dematching_5gnr', dirs: [path + '/lib_rate_dematching_5gnr'], required: true)
+    includes += include_directories(path + '/lib_ldpc_encoder_5gnr')
+    includes += include_directories(path + '/lib_ldpc_decoder_5gnr')
+    includes += include_directories(path + '/lib_LDPC_ratematch_5gnr')
+    includes += include_directories(path + '/lib_rate_dematching_5gnr')
+    cflags += ['-DRTE_BBDEV_SDK_AVX512']
 endif
 
 deps += ['bbdev', 'bus_vdev', 'ring']
diff --git a/drivers/bus/dpaa/meson.build b/drivers/bus/dpaa/meson.build
index a3471403e2..9ff7bf21de 100644
--- a/drivers/bus/dpaa/meson.build
+++ b/drivers/bus/dpaa/meson.build
@@ -2,28 +2,28 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax', 'eventdev']
 sources = files('base/fman/fman.c',
-		'base/fman/fman_hw.c',
-		'base/fman/netcfg_layer.c',
-		'base/qbman/bman.c',
-		'base/qbman/bman_driver.c',
-		'base/qbman/dpaa_alloc.c',
-		'base/qbman/dpaa_sys.c',
-		'base/qbman/process.c',
-		'base/qbman/qman.c',
-		'base/qbman/qman_driver.c',
-		'dpaa_bus.c')
+        'base/fman/fman_hw.c',
+        'base/fman/netcfg_layer.c',
+        'base/qbman/bman.c',
+        'base/qbman/bman_driver.c',
+        'base/qbman/dpaa_alloc.c',
+        'base/qbman/dpaa_sys.c',
+        'base/qbman/process.c',
+        'base/qbman/qman.c',
+        'base/qbman/qman_driver.c',
+        'dpaa_bus.c')
 
 if cc.has_argument('-Wno-cast-qual')
-	cflags += '-Wno-cast-qual'
+    cflags += '-Wno-cast-qual'
 endif
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 includes += include_directories('include', 'base/qbman')
diff --git a/drivers/bus/fslmc/meson.build b/drivers/bus/fslmc/meson.build
index 260e7ef712..90f3e5674a 100644
--- a/drivers/bus/fslmc/meson.build
+++ b/drivers/bus/fslmc/meson.build
@@ -2,24 +2,24 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax', 'eventdev', 'kvargs']
 sources = files('fslmc_bus.c',
-		'fslmc_vfio.c',
-		'mc/dpbp.c',
-		'mc/dpci.c',
-		'mc/dpcon.c',
-		'mc/dpdmai.c',
-		'mc/dpio.c',
-		'mc/dpmng.c',
-		'mc/mc_sys.c',
-		'portal/dpaa2_hw_dpbp.c',
-		'portal/dpaa2_hw_dpci.c',
-		'portal/dpaa2_hw_dpio.c',
-		'qbman/qbman_portal.c',
-		'qbman/qbman_debug.c')
+        'fslmc_vfio.c',
+        'mc/dpbp.c',
+        'mc/dpci.c',
+        'mc/dpcon.c',
+        'mc/dpdmai.c',
+        'mc/dpio.c',
+        'mc/dpmng.c',
+        'mc/mc_sys.c',
+        'portal/dpaa2_hw_dpbp.c',
+        'portal/dpaa2_hw_dpci.c',
+        'portal/dpaa2_hw_dpio.c',
+        'qbman/qbman_portal.c',
+        'qbman/qbman_debug.c')
 
 includes += include_directories('mc', 'qbman/include', 'portal')
diff --git a/drivers/bus/ifpga/meson.build b/drivers/bus/ifpga/meson.build
index 4d0507f553..cc5047e3ce 100644
--- a/drivers/bus/ifpga/meson.build
+++ b/drivers/bus/ifpga/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2010-2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 deps += ['pci', 'kvargs', 'rawdev']
diff --git a/drivers/bus/pci/meson.build b/drivers/bus/pci/meson.build
index 78ec830b25..800ef7eabe 100644
--- a/drivers/bus/pci/meson.build
+++ b/drivers/bus/pci/meson.build
@@ -4,23 +4,23 @@
 deps += ['pci']
 headers = files('rte_bus_pci.h')
 sources = files('pci_common.c',
-	'pci_params.c')
+    'pci_params.c')
 if is_linux
-	sources += files('pci_common_uio.c',
-			'linux/pci.c',
-			'linux/pci_uio.c',
-			'linux/pci_vfio.c')
-	includes += include_directories('linux')
+    sources += files('pci_common_uio.c',
+            'linux/pci.c',
+            'linux/pci_uio.c',
+            'linux/pci_vfio.c')
+    includes += include_directories('linux')
 endif
 if is_freebsd
-	sources += files('pci_common_uio.c',
-			'bsd/pci.c')
-	includes += include_directories('bsd')
+    sources += files('pci_common_uio.c',
+            'bsd/pci.c')
+    includes += include_directories('bsd')
 endif
 if is_windows
-	sources += files('windows/pci.c',
-			'windows/pci_netuio.c')
-	includes += include_directories('windows')
+    sources += files('windows/pci.c',
+            'windows/pci_netuio.c')
+    includes += include_directories('windows')
 endif
 
 deps += ['kvargs']
diff --git a/drivers/bus/vdev/meson.build b/drivers/bus/vdev/meson.build
index 44b2966baa..3537423346 100644
--- a/drivers/bus/vdev/meson.build
+++ b/drivers/bus/vdev/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('vdev.c',
-	'vdev_params.c')
+    'vdev_params.c')
 headers = files('rte_bus_vdev.h')
 
 deps += ['kvargs']
diff --git a/drivers/bus/vmbus/meson.build b/drivers/bus/vmbus/meson.build
index 47e26703aa..50a2409e0b 100644
--- a/drivers/bus/vmbus/meson.build
+++ b/drivers/bus/vmbus/meson.build
@@ -1,24 +1,24 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 
 headers = files('rte_bus_vmbus.h','rte_vmbus_reg.h')
 
 sources = files('vmbus_common.c',
-		'vmbus_channel.c',
-		'vmbus_bufring.c',
-		'vmbus_common_uio.c')
+        'vmbus_channel.c',
+        'vmbus_bufring.c',
+        'vmbus_common_uio.c')
 
 if is_linux
-	sources += files('linux/vmbus_bus.c',
-			'linux/vmbus_uio.c')
-	includes += include_directories('linux')
+    sources += files('linux/vmbus_bus.c',
+            'linux/vmbus_uio.c')
+    includes += include_directories('linux')
 else
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
diff --git a/drivers/common/cnxk/meson.build b/drivers/common/cnxk/meson.build
index 4573d1388a..178bce7ab8 100644
--- a/drivers/common/cnxk/meson.build
+++ b/drivers/common/cnxk/meson.build
@@ -3,46 +3,48 @@
 #
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit Linux'
+    subdir_done()
 endif
 
 config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
 deps = ['eal', 'pci', 'bus_pci', 'mbuf']
-sources = files('roc_dev.c',
-		'roc_idev.c',
-		'roc_irq.c',
-		'roc_mbox.c',
-		'roc_model.c',
-		'roc_nix.c',
-		'roc_nix_debug.c',
-		'roc_nix_fc.c',
-		'roc_nix_irq.c',
-		'roc_nix_mac.c',
-		'roc_nix_mcast.c',
-		'roc_nix_npc.c',
-		'roc_nix_ops.c',
-		'roc_nix_ptp.c',
-		'roc_nix_queue.c',
-		'roc_nix_rss.c',
-		'roc_nix_stats.c',
-		'roc_nix_tm.c',
-		'roc_nix_tm_ops.c',
-		'roc_nix_tm_utils.c',
-		'roc_nix_vlan.c',
-		'roc_npa.c',
-		'roc_npa_debug.c',
-		'roc_npa_irq.c',
-		'roc_npc.c',
-		'roc_npc_mcam.c',
-		'roc_npc_parse.c',
-		'roc_npc_utils.c',
-		'roc_platform.c',
-		'roc_sso.c',
-		'roc_sso_debug.c',
-		'roc_sso_irq.c',
-		'roc_tim.c',
-		'roc_tim_irq.c',
-		'roc_utils.c')
+sources = files(
+        'roc_dev.c',
+        'roc_idev.c',
+        'roc_irq.c',
+        'roc_mbox.c',
+        'roc_model.c',
+        'roc_nix.c',
+        'roc_nix_debug.c',
+        'roc_nix_fc.c',
+        'roc_nix_irq.c',
+        'roc_nix_mac.c',
+        'roc_nix_mcast.c',
+        'roc_nix_npc.c',
+        'roc_nix_ops.c',
+        'roc_nix_ptp.c',
+        'roc_nix_queue.c',
+        'roc_nix_rss.c',
+        'roc_nix_stats.c',
+        'roc_nix_tm.c',
+        'roc_nix_tm_ops.c',
+        'roc_nix_tm_utils.c',
+        'roc_nix_vlan.c',
+        'roc_npa.c',
+        'roc_npa_debug.c',
+        'roc_npa_irq.c',
+        'roc_npc.c',
+        'roc_npc_mcam.c',
+        'roc_npc_parse.c',
+        'roc_npc_utils.c',
+        'roc_platform.c',
+        'roc_sso.c',
+        'roc_sso_debug.c',
+        'roc_sso_irq.c',
+        'roc_tim.c',
+        'roc_tim_irq.c',
+        'roc_utils.c',
+)
 includes += include_directories('../../bus/pci')
diff --git a/drivers/common/cpt/meson.build b/drivers/common/cpt/meson.build
index 1127267ba5..c09824a651 100644
--- a/drivers/common/cpt/meson.build
+++ b/drivers/common/cpt/meson.build
@@ -2,13 +2,12 @@
 # Copyright(c) 2018 Cavium, Inc
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
-sources = files('cpt_fpm_tables.c',
-		'cpt_pmd_ops_helper.c')
+sources = files('cpt_fpm_tables.c', 'cpt_pmd_ops_helper.c')
 
 deps = ['kvargs', 'pci', 'cryptodev']
 includes += include_directories('../../crypto/octeontx')
diff --git a/drivers/common/dpaax/meson.build b/drivers/common/dpaax/meson.build
index b7f177a62e..a162779116 100644
--- a/drivers/common/dpaax/meson.build
+++ b/drivers/common/dpaax/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
@@ -11,8 +11,8 @@ sources = files('dpaax_iova_table.c', 'dpaa_of.c', 'caamflib.c')
 includes += include_directories('caamflib')
 
 if cc.has_argument('-Wno-cast-qual')
-	cflags += '-Wno-cast-qual'
+    cflags += '-Wno-cast-qual'
 endif
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index 5d6a861689..3ca24988fc 100644
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -9,48 +9,47 @@ LIB_GLUE_BASE = 'librte_common_mlx5_glue.so'
 LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
-	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
-	cflags += [
-		'-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
-		'-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
-	]
+    dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
+    cflags += [
+            '-DMLX5_GLUE="@0@"'.format(LIB_GLUE),
+            '-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
+    ]
 endif
 
 libnames = [ 'mlx5', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-	lib = dependency('lib' + libname, static:static_ibverbs,
-			required:false, method: 'pkg-config')
-	if not lib.found() and not static_ibverbs
-		lib = cc.find_library(libname, required:false)
-	endif
-	if lib.found()
-		libs += lib
-		if not static_ibverbs and not dlopen_ibverbs
-			ext_deps += lib
-		endif
-	else
-		build = false
-		reason = 'missing dependency, "' + libname + '"'
-		subdir_done()
-	endif
+    lib = dependency('lib' + libname, static:static_ibverbs, required:false, method: 'pkg-config')
+    if not lib.found() and not static_ibverbs
+        lib = cc.find_library(libname, required:false)
+    endif
+    if lib.found()
+        libs += lib
+        if not static_ibverbs and not dlopen_ibverbs
+            ext_deps += lib
+        endif
+    else
+        build = false
+        reason = 'missing dependency, "' + libname + '"'
+        subdir_done()
+    endif
 endforeach
 if static_ibverbs or dlopen_ibverbs
-	# Build without adding shared libs to Requires.private
-	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
-	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+    # Build without adding shared libs to Requires.private
+    ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+    ext_deps += declare_dependency(compile_args: ibv_cflags.split())
 endif
 if static_ibverbs
-	# Add static deps ldflags to internal apps and Libs.private
-	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
-	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+    # Add static deps ldflags to internal apps and Libs.private
+    ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+    ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
 sources += files('mlx5_nl.c')
 sources += files('mlx5_common_os.c')
 sources += files('mlx5_common_verbs.c')
 if not dlopen_ibverbs
-	sources += files('mlx5_glue.c')
+    sources += files('mlx5_glue.c')
 endif
 
 # To maintain the compatibility with the make build system
@@ -59,171 +58,167 @@ endif
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search", "struct member to search" ]
 has_member_args = [
-	[ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',
-	'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],
-	[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',
-	'struct ibv_counter_set_init_attr', 'counter_set_id' ],
-	[ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',
-	'struct ibv_counters_init_attr', 'comp_mask' ],
-	[ 'HAVE_MLX5DV_DEVX_UAR_OFFSET', 'infiniband/mlx5dv.h',
-	'struct mlx5dv_devx_uar', 'mmap_off' ],
+        [ 'HAVE_IBV_MLX5_MOD_SWP', 'infiniband/mlx5dv.h',
+            'struct mlx5dv_sw_parsing_caps', 'sw_parsing_offloads' ],
+        [ 'HAVE_IBV_DEVICE_COUNTERS_SET_V42', 'infiniband/verbs.h',
+            'struct ibv_counter_set_init_attr', 'counter_set_id' ],
+        [ 'HAVE_IBV_DEVICE_COUNTERS_SET_V45', 'infiniband/verbs.h',
+            'struct ibv_counters_init_attr', 'comp_mask' ],
+        [ 'HAVE_MLX5DV_DEVX_UAR_OFFSET', 'infiniband/mlx5dv.h',
+            'struct mlx5dv_devx_uar', 'mmap_off' ],
 ]
 # input array for meson symbol search:
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search" ]
 has_sym_args = [
-	[ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',
-	'IBV_ACCESS_RELAXED_ORDERING ' ],
-	[ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',
-	'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],
-	[ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],
-	[ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
-	[ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
-	'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
-	[ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
-	'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
-	[ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
-	'mlx5dv_create_flow_action_packet_reformat' ],
-	[ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
-	'IBV_FLOW_SPEC_MPLS' ],
-	[ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',
-	'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],
-	[ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
-	'IBV_WQ_FLAG_RX_END_PADDING' ],
-	[ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',
-	'mlx5dv_query_devx_port' ],
-	[ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_obj_create' ],
-	[ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
-	'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS', 'infiniband/mlx5dv.h',
-	'MLX5DV_FLOW_ACTION_DEFAULT_MISS' ],
-	[ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_obj_query_async' ],
-	[ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_qp_query' ],
-	[ 'HAVE_MLX5DV_PP_ALLOC', 'infiniband/mlx5dv.h',
-	'mlx5dv_pp_alloc' ],
-	[ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_dest_devx_tir' ],
-	[ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
-	'mlx5dv_devx_get_event' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_flow_meter' ],
-	[ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',
-	'MLX5_MMAP_GET_NC_PAGES_CMD' ],
-	[ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
-	'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],
-	[ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
-	'MLX5DV_DR_DOMAIN_TYPE_FDB' ],
-	[ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_push_vlan' ],
-	[ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],
-	[ 'HAVE_MLX5_OPCODE_ENHANCED_MPSW', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_ENHANCED_MPSW' ],
-	[ 'HAVE_MLX5_OPCODE_SEND_EN', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_SEND_EN' ],
-	[ 'HAVE_MLX5_OPCODE_WAIT', 'infiniband/mlx5dv.h',
-	'MLX5_OPCODE_WAIT' ],
+        [ 'HAVE_IBV_RELAXED_ORDERING', 'infiniband/verbs.h',
+            'IBV_ACCESS_RELAXED_ORDERING ' ],
+        [ 'HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT', 'infiniband/mlx5dv.h',
+            'MLX5DV_CQE_RES_FORMAT_CSUM_STRIDX' ],
+        [ 'HAVE_IBV_DEVICE_TUNNEL_SUPPORT', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS' ],
+        [ 'HAVE_IBV_MLX5_MOD_MPW', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED' ],
+        [ 'HAVE_IBV_MLX5_MOD_CQE_128B_COMP', 'infiniband/mlx5dv.h',
+            'MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP' ],
+        [ 'HAVE_IBV_MLX5_MOD_CQE_128B_PAD', 'infiniband/mlx5dv.h',
+            'MLX5DV_CQ_INIT_ATTR_FLAGS_CQE_PAD' ],
+        [ 'HAVE_IBV_FLOW_DV_SUPPORT', 'infiniband/mlx5dv.h',
+            'mlx5dv_create_flow_action_packet_reformat' ],
+        [ 'HAVE_IBV_DEVICE_MPLS_SUPPORT', 'infiniband/verbs.h',
+            'IBV_FLOW_SPEC_MPLS' ],
+        [ 'HAVE_IBV_WQ_FLAGS_PCI_WRITE_END_PADDING', 'infiniband/verbs.h',
+            'IBV_WQ_FLAGS_PCI_WRITE_END_PADDING' ],
+        [ 'HAVE_IBV_WQ_FLAG_RX_END_PADDING', 'infiniband/verbs.h',
+            'IBV_WQ_FLAG_RX_END_PADDING' ],
+        [ 'HAVE_MLX5DV_DR_DEVX_PORT', 'infiniband/mlx5dv.h',
+            'mlx5dv_query_devx_port' ],
+        [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_obj_create' ],
+        [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h',
+            'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_DEFAULT_MISS', 'infiniband/mlx5dv.h',
+            'MLX5DV_FLOW_ACTION_DEFAULT_MISS' ],
+        [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_obj_query_async' ],
+        [ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_qp_query' ],
+        [ 'HAVE_MLX5DV_PP_ALLOC', 'infiniband/mlx5dv.h',
+            'mlx5dv_pp_alloc' ],
+        [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_dest_devx_tir' ],
+        [ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h',
+            'mlx5dv_devx_get_event' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_flow_meter' ],
+        [ 'HAVE_MLX5DV_MMAP_GET_NC_PAGES_CMD', 'infiniband/mlx5dv.h',
+            'MLX5_MMAP_GET_NC_PAGES_CMD' ],
+        [ 'HAVE_MLX5DV_DR', 'infiniband/mlx5dv.h',
+            'MLX5DV_DR_DOMAIN_TYPE_NIC_RX' ],
+        [ 'HAVE_MLX5DV_DR_ESWITCH', 'infiniband/mlx5dv.h',
+            'MLX5DV_DR_DOMAIN_TYPE_FDB' ],
+        [ 'HAVE_MLX5DV_DR_VLAN', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_push_vlan' ],
+        [ 'HAVE_IBV_VAR', 'infiniband/mlx5dv.h', 'mlx5dv_alloc_var' ],
+        [ 'HAVE_MLX5_OPCODE_ENHANCED_MPSW', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_ENHANCED_MPSW' ],
+        [ 'HAVE_MLX5_OPCODE_SEND_EN', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_SEND_EN' ],
+        [ 'HAVE_MLX5_OPCODE_WAIT', 'infiniband/mlx5dv.h',
+            'MLX5_OPCODE_WAIT' ],
         [ 'HAVE_MLX5_OPCODE_ACCESS_ASO', 'infiniband/mlx5dv.h',
-        'MLX5_OPCODE_ACCESS_ASO' ],
-	[ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseKR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseCR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseSR4_Full' ],
-	[ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_40000baseLR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseKR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseCR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseSR4_Full' ],
-	[ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',
-	'SUPPORTED_56000baseLR4_Full' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],
-	[ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',
-	'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],
-	[ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',
-	'IFLA_NUM_VF' ],
-	[ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',
-	'IFLA_EXT_MASK' ],
-	[ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',
-	'IFLA_PHYS_SWITCH_ID' ],
-	[ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
-	'IFLA_PHYS_PORT_NAME' ],
-	[ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',
-	'RDMA_NL_NLDEV' ],
-	[ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_CMD_GET' ],
-	[ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_CMD_PORT_GET' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_DEV_INDEX' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_DEV_NAME' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_PORT_INDEX' ],
-	[ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',
-	'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
-	[ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
-	'mlx5dv_dump_dr_domain'],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_flow_sampler'],
-	[ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_domain_set_reclaim_device_memory'],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_dest_array'],
-	[ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
-	[ 'HAVE_MLX5_DR_CREATE_ACTION_ASO', 'infiniband/mlx5dv.h',
-	'mlx5dv_dr_action_create_aso' ],
-	[ 'HAVE_INFINIBAND_VERBS_H', 'infiniband/verbs.h',
-	'INFINIBAND_VERBS_H' ],
+            'MLX5_OPCODE_ACCESS_ASO' ],
+        [ 'HAVE_SUPPORTED_40000baseKR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseKR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseCR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseCR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseSR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseSR4_Full' ],
+        [ 'HAVE_SUPPORTED_40000baseLR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_40000baseLR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseKR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseKR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseCR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseCR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseSR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseSR4_Full' ],
+        [ 'HAVE_SUPPORTED_56000baseLR4_Full', 'linux/ethtool.h',
+            'SUPPORTED_56000baseLR4_Full' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_25G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_25000baseCR_Full_BIT' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_50G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT' ],
+        [ 'HAVE_ETHTOOL_LINK_MODE_100G', 'linux/ethtool.h',
+            'ETHTOOL_LINK_MODE_100000baseKR4_Full_BIT' ],
+        [ 'HAVE_IFLA_NUM_VF', 'linux/if_link.h',
+            'IFLA_NUM_VF' ],
+        [ 'HAVE_IFLA_EXT_MASK', 'linux/if_link.h',
+            'IFLA_EXT_MASK' ],
+        [ 'HAVE_IFLA_PHYS_SWITCH_ID', 'linux/if_link.h',
+            'IFLA_PHYS_SWITCH_ID' ],
+        [ 'HAVE_IFLA_PHYS_PORT_NAME', 'linux/if_link.h',
+            'IFLA_PHYS_PORT_NAME' ],
+        [ 'HAVE_RDMA_NL_NLDEV', 'rdma/rdma_netlink.h',
+            'RDMA_NL_NLDEV' ],
+        [ 'HAVE_RDMA_NLDEV_CMD_GET', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_CMD_GET' ],
+        [ 'HAVE_RDMA_NLDEV_CMD_PORT_GET', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_CMD_PORT_GET' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_DEV_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_DEV_INDEX' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_DEV_NAME', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_DEV_NAME' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_PORT_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_PORT_INDEX' ],
+        [ 'HAVE_RDMA_NLDEV_ATTR_NDEV_INDEX', 'rdma/rdma_netlink.h',
+            'RDMA_NLDEV_ATTR_NDEV_INDEX' ],
+        [ 'HAVE_MLX5_DR_FLOW_DUMP', 'infiniband/mlx5dv.h',
+            'mlx5dv_dump_dr_domain'],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_SAMPLE', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_flow_sampler'],
+        [ 'HAVE_MLX5DV_DR_MEM_RECLAIM', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_domain_set_reclaim_device_memory'],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_DEST_ARRAY', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_dest_array'],
+        [ 'HAVE_DEVLINK', 'linux/devlink.h', 'DEVLINK_GENL_NAME' ],
+        [ 'HAVE_MLX5_DR_CREATE_ACTION_ASO', 'infiniband/mlx5dv.h',
+            'mlx5dv_dr_action_create_aso' ],
+        [ 'HAVE_INFINIBAND_VERBS_H', 'infiniband/verbs.h',
+            'INFINIBAND_VERBS_H' ],
         [ 'HAVE_MLX5_UMR_IMKEY', 'infiniband/mlx5dv.h',
-        'MLX5_WQE_UMR_CTRL_FLAG_INLINE' ],
+            'MLX5_WQE_UMR_CTRL_FLAG_INLINE' ],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
-		dependencies: libs))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], dependencies: libs))
 endforeach
 foreach arg:has_member_args
-	file_prefix = '#include <' + arg[1] + '>'
-	config.set(arg[0], cc.has_member(arg[2], arg[3],
-		prefix : file_prefix, dependencies: libs))
+    file_prefix = '#include <' + arg[1] + '>'
+    config.set(arg[0], cc.has_member(arg[2], arg[3], prefix : file_prefix, dependencies: libs))
 endforeach
 configure_file(output : 'mlx5_autoconf.h', configuration : config)
 
 # Build Glue Library
 if dlopen_ibverbs
-	dlopen_name = 'mlx5_glue'
-	dlopen_lib_name = 'rte_common_' + dlopen_name
-	dlopen_so_version = LIB_GLUE_VERSION
-	dlopen_sources = files('mlx5_glue.c')
-	dlopen_install_dir = [ eal_pmd_path + '-glue' ]
-	dlopen_includes = [global_inc]
-	dlopen_includes += include_directories(
-		'../../../../lib/librte_eal/include/generic',
-	)
-	shared_lib = shared_library(
-		dlopen_lib_name,
-		dlopen_sources,
-		include_directories: dlopen_includes,
-		c_args: cflags,
-		dependencies: libs,
-		link_args: [
-		'-Wl,-export-dynamic',
-		'-Wl,-h,@0@'.format(LIB_GLUE),
-		],
-		soversion: dlopen_so_version,
-		install: true,
-		install_dir: dlopen_install_dir,
-	)
+    dlopen_name = 'mlx5_glue'
+    dlopen_lib_name = 'rte_common_' + dlopen_name
+    dlopen_so_version = LIB_GLUE_VERSION
+    dlopen_sources = files('mlx5_glue.c')
+    dlopen_install_dir = [ eal_pmd_path + '-glue' ]
+    dlopen_includes = [global_inc]
+    dlopen_includes += include_directories('../../../../lib/librte_eal/include/generic')
+    shared_lib = shared_library(
+            dlopen_lib_name,
+            dlopen_sources,
+            include_directories: dlopen_includes,
+            c_args: cflags,
+            dependencies: libs,
+            link_args: [
+                '-Wl,-export-dynamic',
+                '-Wl,-h,@0@'.format(LIB_GLUE),
+            ],
+            soversion: dlopen_so_version,
+            install: true,
+            install_dir: dlopen_install_dir,
+    )
 endif
diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
index b2efea4432..b5585d2cc3 100644
--- a/drivers/common/mlx5/meson.build
+++ b/drivers/common/mlx5/meson.build
@@ -2,38 +2,38 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if not (is_linux or (is_windows and is_ms_linker))
-	build = false
-	reason = 'only supported on Linux and Windows build with clang'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux and Windows build with clang'
+    subdir_done()
 endif
 
 deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs']
 sources += files(
-	'mlx5_devx_cmds.c',
-	'mlx5_common.c',
-	'mlx5_common_mp.c',
-	'mlx5_common_mr.c',
-	'mlx5_malloc.c',
-	'mlx5_common_pci.c',
-	'mlx5_common_devx.c',
+        'mlx5_devx_cmds.c',
+        'mlx5_common.c',
+        'mlx5_common_mp.c',
+        'mlx5_common_mr.c',
+        'mlx5_malloc.c',
+        'mlx5_common_pci.c',
+        'mlx5_common_devx.c',
 )
 
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 
 subdir(exec_env)
diff --git a/drivers/common/mlx5/windows/meson.build b/drivers/common/mlx5/windows/meson.build
index 16349c34f1..4a34a15eae 100644
--- a/drivers/common/mlx5/windows/meson.build
+++ b/drivers/common/mlx5/windows/meson.build
@@ -4,17 +4,17 @@
 includes += include_directories('.')
 
 sources += files(
-	'mlx5_glue.c',
-	'mlx5_common_os.c',
+        'mlx5_glue.c',
+        'mlx5_common_os.c',
 )
 
 res_lib = run_command(python3, '-c', 'import os; print(os.environ["DEVX_LIB_PATH"])')
 res_inc = run_command(python3, '-c', 'import os; print(os.environ["DEVX_INC_PATH"])')
 
 if (res_lib.returncode() != 0 or res_inc.returncode() != 0)
-	build = false
-	reason = 'DevX environment variables are not set, DEVX_LIB_PATH and DEVX_INC_PATH vars must be exported'
-	subdir_done()
+    build = false
+    reason = 'DevX environment variables are not set, DEVX_LIB_PATH and DEVX_INC_PATH vars must be exported'
+    subdir_done()
 endif
 
 devx_lib_dir = res_lib.stdout().strip()
@@ -23,21 +23,21 @@ devx_inc_dir = res_inc.stdout().strip()
 ext_deps += cc.find_library('mlx5devx', dirs: devx_lib_dir, required: true)
 includes += include_directories(devx_inc_dir)
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 
 # Generate an empty mlx5_autoconf.h file for compatibility with Linux
diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index a929e2311e..0e17e100cd 100644
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -5,16 +5,16 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/common/octeontx/meson.build b/drivers/common/octeontx/meson.build
index 02b57b95c5..fcda0f6445 100644
--- a/drivers/common/octeontx/meson.build
+++ b/drivers/common/octeontx/meson.build
@@ -3,9 +3,9 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    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 97293d1a7c..ae22db060b 100644
--- a/drivers/common/octeontx2/meson.build
+++ b/drivers/common/octeontx2/meson.build
@@ -3,24 +3,27 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    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'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources= files('otx2_dev.c',
-		'otx2_irq.c',
-		'otx2_mbox.c',
-		'otx2_common.c',
-		'otx2_sec_idev.c',
-	       )
+        'otx2_irq.c',
+        'otx2_mbox.c',
+        'otx2_common.c',
+        'otx2_sec_idev.c',
+)
 
 deps = ['eal', 'pci', 'ethdev', 'kvargs']
-includes += include_directories('../../common/octeontx2',
-		'../../mempool/octeontx2', '../../bus/pci')
+includes += include_directories(
+        '../../common/octeontx2',
+        '../../mempool/octeontx2',
+        '../../bus/pci',
+)
diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index fe278f734f..0690b24e2d 100644
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017-2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 qat_crypto = true
@@ -15,55 +15,58 @@ qat_compress_path = 'compress/qat'
 qat_compress_relpath = '../../' + qat_compress_path
 
 if disable_drivers.contains(qat_crypto_path)
-	qat_crypto = false
-	dpdk_drvs_disabled += qat_crypto_path
-	set_variable(qat_crypto_path.underscorify() + '_disable_reason',
-			'Explicitly disabled via build config')
+    qat_crypto = false
+    dpdk_drvs_disabled += qat_crypto_path
+    set_variable(qat_crypto_path.underscorify() + '_disable_reason',
+            'Explicitly disabled via build config')
 endif
 if disable_drivers.contains(qat_compress_path)
-	qat_compress = false
-	dpdk_drvs_disabled += qat_compress_path
-	set_variable(qat_compress_path.underscorify() + '_disable_reason',
-			'Explicitly disabled via build config')
+    qat_compress = false
+    dpdk_drvs_disabled += qat_compress_path
+    set_variable(qat_compress_path.underscorify() + '_disable_reason',
+            'Explicitly disabled via build config')
 endif
 
 libcrypto = dependency('libcrypto', required: false, method: 'pkg-config')
 if qat_crypto and not libcrypto.found()
-	qat_crypto = false
-	dpdk_drvs_disabled += qat_crypto_path
-	set_variable(qat_crypto_path.underscorify() + '_disable_reason',
-			'missing dependency, libcrypto')
+    qat_crypto = false
+    dpdk_drvs_disabled += qat_crypto_path
+    set_variable(qat_crypto_path.underscorify() + '_disable_reason',
+            'missing dependency, libcrypto')
 endif
 
 # The driver should not build if both compression and crypto are disabled
 #FIXME common code depends on compression files so check only compress!
 if not qat_compress # and not qat_crypto
-	build = false
-	reason = '' # rely on reason for compress/crypto above
-	subdir_done()
+    build = false
+    reason = '' # rely on reason for compress/crypto above
+    subdir_done()
 endif
 
 deps += ['bus_pci', 'cryptodev', 'net', 'compressdev']
-sources += files('qat_common.c',
-		'qat_qp.c',
-		'qat_device.c',
-		'qat_logs.c')
+sources += files(
+        'qat_common.c',
+        'qat_qp.c',
+        'qat_device.c',
+        'qat_logs.c',
+)
 includes += include_directories('qat_adf',
-		qat_crypto_relpath,
-		qat_compress_relpath)
+        qat_crypto_relpath,
+        qat_compress_relpath,
+)
 
 if qat_compress
-	foreach f: ['qat_comp_pmd.c', 'qat_comp.c']
-		sources += files(join_paths(qat_compress_relpath, f))
-	endforeach
+    foreach f: ['qat_comp_pmd.c', 'qat_comp.c']
+        sources += files(join_paths(qat_compress_relpath, f))
+    endforeach
 endif
 
 if qat_crypto
-	foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
-			'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
-		sources += files(join_paths(qat_crypto_relpath, f))
-	endforeach
-	deps += ['security']
-	ext_deps += libcrypto
-	cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
+    foreach f: ['qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c',
+            'qat_sym_hw_dp.c', 'qat_asym_pmd.c', 'qat_asym.c']
+        sources += files(join_paths(qat_crypto_relpath, f))
+    endforeach
+    deps += ['security']
+    ext_deps += libcrypto
+    cflags += ['-DBUILD_QAT_SYM', '-DBUILD_QAT_ASYM']
 endif
diff --git a/drivers/common/sfc_efx/base/meson.build b/drivers/common/sfc_efx/base/meson.build
index 1a39418c65..313e53d77a 100644
--- a/drivers/common/sfc_efx/base/meson.build
+++ b/drivers/common/sfc_efx/base/meson.build
@@ -6,87 +6,87 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 sources = [
-	'efx_bootcfg.c',
-	'efx_crc32.c',
-	'efx_ev.c',
-	'efx_evb.c',
-	'efx_filter.c',
-	'efx_hash.c',
-	'efx_intr.c',
-	'efx_lic.c',
-	'efx_mac.c',
-	'efx_mae.c',
-	'efx_mcdi.c',
-	'efx_mon.c',
-	'efx_nic.c',
-	'efx_nvram.c',
-	'efx_pci.c',
-	'efx_phy.c',
-	'efx_port.c',
-	'efx_proxy.c',
-	'efx_rx.c',
-	'efx_sram.c',
-	'efx_tunnel.c',
-	'efx_tx.c',
-	'efx_vpd.c',
-	'efx_virtio.c',
-	'mcdi_mon.c',
-	'siena_mac.c',
-	'siena_mcdi.c',
-	'siena_nic.c',
-	'siena_nvram.c',
-	'siena_phy.c',
-	'siena_sram.c',
-	'siena_vpd.c',
-	'ef10_ev.c',
-	'ef10_evb.c',
-	'ef10_filter.c',
-	'ef10_image.c',
-	'ef10_intr.c',
-	'ef10_mac.c',
-	'ef10_mcdi.c',
-	'ef10_nic.c',
-	'ef10_nvram.c',
-	'ef10_phy.c',
-	'ef10_proxy.c',
-	'ef10_rx.c',
-	'ef10_tx.c',
-	'ef10_vpd.c',
-	'hunt_nic.c',
-	'medford_nic.c',
-	'medford2_nic.c',
-	'rhead_ev.c',
-	'rhead_intr.c',
-	'rhead_nic.c',
-	'rhead_pci.c',
-	'rhead_rx.c',
-	'rhead_tunnel.c',
-	'rhead_tx.c',
-	'rhead_virtio.c',
+        'efx_bootcfg.c',
+        'efx_crc32.c',
+        'efx_ev.c',
+        'efx_evb.c',
+        'efx_filter.c',
+        'efx_hash.c',
+        'efx_intr.c',
+        'efx_lic.c',
+        'efx_mac.c',
+        'efx_mae.c',
+        'efx_mcdi.c',
+        'efx_mon.c',
+        'efx_nic.c',
+        'efx_nvram.c',
+        'efx_pci.c',
+        'efx_phy.c',
+        'efx_port.c',
+        'efx_proxy.c',
+        'efx_rx.c',
+        'efx_sram.c',
+        'efx_tunnel.c',
+        'efx_tx.c',
+        'efx_vpd.c',
+        'efx_virtio.c',
+        'mcdi_mon.c',
+        'siena_mac.c',
+        'siena_mcdi.c',
+        'siena_nic.c',
+        'siena_nvram.c',
+        'siena_phy.c',
+        'siena_sram.c',
+        'siena_vpd.c',
+        'ef10_ev.c',
+        'ef10_evb.c',
+        'ef10_filter.c',
+        'ef10_image.c',
+        'ef10_intr.c',
+        'ef10_mac.c',
+        'ef10_mcdi.c',
+        'ef10_nic.c',
+        'ef10_nvram.c',
+        'ef10_phy.c',
+        'ef10_proxy.c',
+        'ef10_rx.c',
+        'ef10_tx.c',
+        'ef10_vpd.c',
+        'hunt_nic.c',
+        'medford_nic.c',
+        'medford2_nic.c',
+        'rhead_ev.c',
+        'rhead_intr.c',
+        'rhead_nic.c',
+        'rhead_pci.c',
+        'rhead_rx.c',
+        'rhead_tunnel.c',
+        'rhead_tx.c',
+        'rhead_virtio.c',
 ]
 
 extra_flags = [
-	'-Wno-sign-compare',
-	'-Wno-unused-parameter',
-	'-Wno-unused-variable',
-	'-Wno-empty-body',
-	'-Wno-unused-but-set-variable'
+        '-Wno-sign-compare',
+        '-Wno-unused-parameter',
+        '-Wno-unused-variable',
+        '-Wno-empty-body',
+        '-Wno-unused-but-set-variable'
 ]
 
 c_args = cflags
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 if build
-	base_lib = static_library('sfc_base', sources,
-		include_directories: includes,
-		dependencies: static_rte_eal,
-		c_args: c_args)
+    base_lib = static_library('sfc_base', sources,
+        include_directories: includes,
+        dependencies: static_rte_eal,
+        c_args: c_args)
 
-	base_objs = base_lib.extract_all_objects()
+    base_objs = base_lib.extract_all_objects()
 else
-	base_objs = []
+    base_objs = []
 endif
diff --git a/drivers/common/sfc_efx/meson.build b/drivers/common/sfc_efx/meson.build
index 1ca9510733..d87ba396b4 100644
--- a/drivers/common/sfc_efx/meson.build
+++ b/drivers/common/sfc_efx/meson.build
@@ -6,32 +6,32 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
 endif
 
 extra_flags = []
 
 # Enable more warnings
 extra_flags += [
-	'-Wdisabled-optimization'
+        '-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wbad-function-cast'
+        '-Waggregate-return',
+        '-Wbad-function-cast'
 ]
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 subdir('base')
@@ -39,8 +39,8 @@ objs = [base_objs]
 
 deps += ['bus_pci']
 sources = files(
-	'sfc_efx.c',
-	'sfc_efx_mcdi.c',
+        'sfc_efx.c',
+        'sfc_efx_mcdi.c',
 )
 
 includes += include_directories('base')
diff --git a/drivers/compress/isal/meson.build b/drivers/compress/isal/meson.build
index d847c2ea6f..4b3eaa2274 100644
--- a/drivers/compress/isal/meson.build
+++ b/drivers/compress/isal/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('libisal', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libisal"'
+    build = false
+    reason = 'missing dependency, "libisal"'
 endif
 
 deps += 'bus_vdev'
diff --git a/drivers/compress/mlx5/meson.build b/drivers/compress/mlx5/meson.build
index 2a6dc3f7ca..c5c5edfa7d 100644
--- a/drivers/compress/mlx5/meson.build
+++ b/drivers/compress/mlx5/meson.build
@@ -2,25 +2,25 @@
 # Copyright 2021 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 fmt_name = 'mlx5_compress'
 deps += ['common_mlx5', 'eal', 'compressdev']
 sources = files(
-	'mlx5_compress.c',
+        'mlx5_compress.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
diff --git a/drivers/compress/zlib/meson.build b/drivers/compress/zlib/meson.build
index 82cf0dddd6..f8937cad3e 100644
--- a/drivers/compress/zlib/meson.build
+++ b/drivers/compress/zlib/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('zlib', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "zlib"'
+    build = false
+    reason = 'missing dependency, "zlib"'
 endif
 
 deps += 'bus_vdev'
diff --git a/drivers/crypto/aesni_gcm/meson.build b/drivers/crypto/aesni_gcm/meson.build
index ea83e87740..0fcac2a8eb 100644
--- a/drivers/crypto/aesni_gcm/meson.build
+++ b/drivers/crypto/aesni_gcm/meson.build
@@ -4,20 +4,20 @@
 IMB_required_ver = '0.52.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
-	build = false
-	reason = 'missing dependency, "libIPSec_MB"'
+    build = false
+    reason = 'missing dependency, "libIPSec_MB"'
 else
-	ext_deps += lib
+    ext_deps += lib
 
-	# version comes with quotes, so we split based on " and take the middle
-	imb_ver = cc.get_define('IMB_VERSION_STR',
-		prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
+    # version comes with quotes, so we split based on " and take the middle
+    imb_ver = cc.get_define('IMB_VERSION_STR',
+        prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
 
-	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
-		reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
-		build = false
-	endif
+    if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
+        reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
+                IMB_required_ver, imb_ver)
+        build = false
+    endif
 endif
 
 sources = files('aesni_gcm_pmd.c', 'aesni_gcm_pmd_ops.c')
diff --git a/drivers/crypto/aesni_mb/meson.build b/drivers/crypto/aesni_mb/meson.build
index 419b4743f5..ed6b9f53e4 100644
--- a/drivers/crypto/aesni_mb/meson.build
+++ b/drivers/crypto/aesni_mb/meson.build
@@ -4,20 +4,20 @@
 IMB_required_ver = '0.52.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
-	build = false
-	reason = 'missing dependency, "libIPSec_MB"'
+    build = false
+    reason = 'missing dependency, "libIPSec_MB"'
 else
-	ext_deps += lib
+    ext_deps += lib
 
-	# version comes with quotes, so we split based on " and take the middle
-	imb_ver = cc.get_define('IMB_VERSION_STR',
-		prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
+    # version comes with quotes, so we split based on " and take the middle
+    imb_ver = cc.get_define('IMB_VERSION_STR',
+        prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
 
-	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
-		reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
-		build = false
-	endif
+    if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
+        reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
+                IMB_required_ver, imb_ver)
+        build = false
+    endif
 
 endif
 
diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build
index 027173bc1e..40a4dbb7bb 100644
--- a/drivers/crypto/armv8/meson.build
+++ b/drivers/crypto/armv8/meson.build
@@ -3,9 +3,9 @@
 
 dep = dependency('libAArch64crypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libAArch64crypto"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libAArch64crypto"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/crypto/bcmfs/meson.build b/drivers/crypto/bcmfs/meson.build
index 7aa0f05dbd..7801ab3480 100644
--- a/drivers/crypto/bcmfs/meson.build
+++ b/drivers/crypto/bcmfs/meson.build
@@ -5,16 +5,16 @@
 
 deps += ['eal', 'bus_vdev']
 sources = files(
-		'bcmfs_logs.c',
-		'bcmfs_device.c',
-		'bcmfs_vfio.c',
-		'bcmfs_qp.c',
-		'hw/bcmfs4_rm.c',
-		'hw/bcmfs5_rm.c',
-		'hw/bcmfs_rm_common.c',
-		'bcmfs_sym_pmd.c',
-		'bcmfs_sym_capabilities.c',
-		'bcmfs_sym_session.c',
-		'bcmfs_sym.c',
-		'bcmfs_sym_engine.c'
-		)
+        'bcmfs_logs.c',
+        'bcmfs_device.c',
+        'bcmfs_vfio.c',
+        'bcmfs_qp.c',
+        'hw/bcmfs4_rm.c',
+        'hw/bcmfs5_rm.c',
+        'hw/bcmfs_rm_common.c',
+        'bcmfs_sym_pmd.c',
+        'bcmfs_sym_capabilities.c',
+        'bcmfs_sym_session.c',
+        'bcmfs_sym.c',
+        'bcmfs_sym_engine.c'
+        )
diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build
index 68e6b1d44c..b28d5c66af 100644
--- a/drivers/crypto/caam_jr/meson.build
+++ b/drivers/crypto/caam_jr/meson.build
@@ -2,15 +2,15 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_vdev', 'bus_dpaa', 'security']
 sources = files('caam_jr_capabilities.c',
-		'caam_jr_hw.c',
-		'caam_jr_uio.c',
-		'caam_jr.c')
+        'caam_jr_hw.c',
+        'caam_jr_uio.c',
+        'caam_jr.c')
 
 includes += include_directories('../../bus/dpaa/include/')
 includes += include_directories('../../common/dpaax/')
diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build
index ff66427ae8..2d203fe729 100644
--- a/drivers/crypto/ccp/meson.build
+++ b/drivers/crypto/ccp/meson.build
@@ -2,21 +2,21 @@
 # Copyright(c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libcrypto"'
+    build = false
+    reason = 'missing dependency, "libcrypto"'
 endif
 deps += 'bus_vdev'
 deps += 'bus_pci'
 
 sources = files('rte_ccp_pmd.c',
-		'ccp_crypto.c',
-		'ccp_dev.c',
-		'ccp_pci.c',
-		'ccp_pmd_ops.c')
+        'ccp_crypto.c',
+        'ccp_dev.c',
+        'ccp_pci.c',
+        'ccp_pmd_ops.c')
 
 ext_deps += dep
diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build
index 69c7264e5a..b007f06ba7 100644
--- a/drivers/crypto/dpaa2_sec/meson.build
+++ b/drivers/crypto/dpaa2_sec/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['security', 'mempool_dpaa2']
 sources = files('dpaa2_sec_dpseci.c',
-		'mc/dpseci.c')
+        'mc/dpseci.c')
 
 includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib')
diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build
index c391a26711..44fd60e5ae 100644
--- a/drivers/crypto/dpaa_sec/meson.build
+++ b/drivers/crypto/dpaa_sec/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_dpaa', 'mempool_dpaa', 'security']
diff --git a/drivers/crypto/kasumi/meson.build b/drivers/crypto/kasumi/meson.build
index 7560fb7cfa..e6e0f08c3d 100644
--- a/drivers/crypto/kasumi/meson.build
+++ b/drivers/crypto/kasumi/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
-	build = false
-	reason = 'missing dependency, "libIPSec_MB"'
+    build = false
+    reason = 'missing dependency, "libIPSec_MB"'
 else
-	# version comes with quotes, so we split based on " and take the middle
-	imb_ver = cc.get_define('IMB_VERSION_STR',
-		prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
+    # version comes with quotes, so we split based on " and take the middle
+    imb_ver = cc.get_define('IMB_VERSION_STR',
+        prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
 
-	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
-		reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
-		build = false
-	endif
+    if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
+        reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
+                IMB_required_ver, imb_ver)
+        build = false
+    endif
 
 endif
 
diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index b4c55b5ff5..c0c828fbf8 100644
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -5,9 +5,9 @@
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
diff --git a/drivers/crypto/nitrox/meson.build b/drivers/crypto/nitrox/meson.build
index 9c0e89c2c3..cef8379ba5 100644
--- a/drivers/crypto/nitrox/meson.build
+++ b/drivers/crypto/nitrox/meson.build
@@ -2,17 +2,17 @@
 # Copyright(C) 2019 Marvell International Ltd.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_pci']
 sources = files(
-		'nitrox_device.c',
-		'nitrox_hal.c',
-		'nitrox_logs.c',
-		'nitrox_sym.c',
-		'nitrox_sym_capabilities.c',
-		'nitrox_sym_reqmgr.c',
-		'nitrox_qp.c'
-		)
+        'nitrox_device.c',
+        'nitrox_hal.c',
+        'nitrox_logs.c',
+        'nitrox_sym.c',
+        'nitrox_sym_capabilities.c',
+        'nitrox_sym_reqmgr.c',
+        'nitrox_qp.c'
+        )
diff --git a/drivers/crypto/octeontx/meson.build b/drivers/crypto/octeontx/meson.build
index a353d37a10..f08801929d 100644
--- a/drivers/crypto/octeontx/meson.build
+++ b/drivers/crypto/octeontx/meson.build
@@ -1,17 +1,17 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium, Inc
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_pci']
 deps += ['common_cpt']
 
 sources = files('otx_cryptodev.c',
-		'otx_cryptodev_capabilities.c',
-		'otx_cryptodev_hw_access.c',
-		'otx_cryptodev_mbox.c',
-		'otx_cryptodev_ops.c')
+        'otx_cryptodev_capabilities.c',
+        'otx_cryptodev_hw_access.c',
+        'otx_cryptodev_mbox.c',
+        'otx_cryptodev_ops.c')
 
 includes += include_directories('../../common/cpt')
diff --git a/drivers/crypto/octeontx2/meson.build b/drivers/crypto/octeontx2/meson.build
index 283818e5da..00b00df567 100644
--- a/drivers/crypto/octeontx2/meson.build
+++ b/drivers/crypto/octeontx2/meson.build
@@ -2,9 +2,9 @@
 # Copyright (C) 2019 Marvell International Ltd.
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit Linux'
+    subdir_done()
 endif
 
 deps += ['bus_pci']
@@ -15,11 +15,11 @@ deps += ['eventdev']
 deps += ['security']
 
 sources = files('otx2_cryptodev.c',
-		'otx2_cryptodev_capabilities.c',
-		'otx2_cryptodev_hw_access.c',
-		'otx2_cryptodev_mbox.c',
-		'otx2_cryptodev_ops.c',
-		'otx2_cryptodev_sec.c')
+        'otx2_cryptodev_capabilities.c',
+        'otx2_cryptodev_hw_access.c',
+        'otx2_cryptodev_mbox.c',
+        'otx2_cryptodev_ops.c',
+        'otx2_cryptodev_sec.c')
 
 includes += include_directories('../../common/cpt')
 includes += include_directories('../../common/octeontx2')
diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build
index 47fb2bb751..b21fca0be3 100644
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build
@@ -3,8 +3,8 @@
 
 dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libcrypto"'
+    build = false
+    reason = 'missing dependency, "libcrypto"'
 endif
 deps += 'bus_vdev'
 sources = files('rte_openssl_pmd.c', 'rte_openssl_pmd_ops.c')
diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index 92e0ed6565..523a901664 100644
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -11,14 +11,14 @@ qat_deps += 'cryptodev'
 qat_deps += 'net'
 qat_deps += 'security'
 if dep.found()
-	# Add our sources files to the list
-	qat_sources += files('qat_sym_pmd.c',
-			     'qat_sym.c',
-			     'qat_sym_session.c',
-			     'qat_sym_hw_dp.c',
-			     'qat_asym_pmd.c',
-			     'qat_asym.c')
-	qat_ext_deps += dep
-	qat_cflags += '-DBUILD_QAT_SYM'
-	qat_cflags += '-DBUILD_QAT_ASYM'
+    # Add our sources files to the list
+    qat_sources += files('qat_sym_pmd.c',
+                 'qat_sym.c',
+                 'qat_sym_session.c',
+                 'qat_sym_hw_dp.c',
+                 'qat_asym_pmd.c',
+                 'qat_asym.c')
+    qat_ext_deps += dep
+    qat_cflags += '-DBUILD_QAT_SYM'
+    qat_cflags += '-DBUILD_QAT_ASYM'
 endif
diff --git a/drivers/crypto/scheduler/meson.build b/drivers/crypto/scheduler/meson.build
index b67d9306e0..d510f49970 100644
--- a/drivers/crypto/scheduler/meson.build
+++ b/drivers/crypto/scheduler/meson.build
@@ -3,16 +3,16 @@
 
 deps += ['bus_vdev', 'reorder']
 sources = files(
-	'rte_cryptodev_scheduler.c',
-	'scheduler_failover.c',
-	'scheduler_multicore.c',
-	'scheduler_pkt_size_distr.c',
-	'scheduler_pmd.c',
-	'scheduler_pmd_ops.c',
-	'scheduler_roundrobin.c',
+        'rte_cryptodev_scheduler.c',
+        'scheduler_failover.c',
+        'scheduler_multicore.c',
+        'scheduler_pkt_size_distr.c',
+        'scheduler_pmd.c',
+        'scheduler_pmd_ops.c',
+        'scheduler_roundrobin.c',
 )
 
 headers = files(
-	'rte_cryptodev_scheduler.h',
-	'rte_cryptodev_scheduler_operations.h',
+        'rte_cryptodev_scheduler.h',
+        'rte_cryptodev_scheduler_operations.h',
 )
diff --git a/drivers/crypto/snow3g/meson.build b/drivers/crypto/snow3g/meson.build
index c1c5fd37f7..0c087baa2a 100644
--- a/drivers/crypto/snow3g/meson.build
+++ b/drivers/crypto/snow3g/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
-	build = false
-	reason = 'missing dependency, "libIPSec_MB"'
+    build = false
+    reason = 'missing dependency, "libIPSec_MB"'
 else
-	# version comes with quotes, so we split based on " and take the middle
-	imb_ver = cc.get_define('IMB_VERSION_STR',
-		prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
+    # version comes with quotes, so we split based on " and take the middle
+    imb_ver = cc.get_define('IMB_VERSION_STR',
+        prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
 
-	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
+    if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
                 reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
-		build = false
-	endif
+                IMB_required_ver, imb_ver)
+        build = false
+    endif
 
 endif
 
diff --git a/drivers/crypto/virtio/meson.build b/drivers/crypto/virtio/meson.build
index 20e9e9551e..950f411327 100644
--- a/drivers/crypto/virtio/meson.build
+++ b/drivers/crypto/virtio/meson.build
@@ -4,4 +4,4 @@
 includes += include_directories('../../../lib/librte_vhost')
 deps += 'bus_pci'
 sources = files('virtio_cryptodev.c', 'virtio_pci.c',
-		'virtio_rxtx.c', 'virtqueue.c')
+        'virtio_rxtx.c', 'virtqueue.c')
diff --git a/drivers/crypto/zuc/meson.build b/drivers/crypto/zuc/meson.build
index c3454d799e..a5f77a22d8 100644
--- a/drivers/crypto/zuc/meson.build
+++ b/drivers/crypto/zuc/meson.build
@@ -4,18 +4,18 @@
 IMB_required_ver = '0.53.0'
 lib = cc.find_library('IPSec_MB', required: false)
 if not lib.found()
-	build = false
-	reason = 'missing dependency, "libIPSec_MB"'
+    build = false
+    reason = 'missing dependency, "libIPSec_MB"'
 else
-	# version comes with quotes, so we split based on " and take the middle
-	imb_ver = cc.get_define('IMB_VERSION_STR',
-		prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
+    # version comes with quotes, so we split based on " and take the middle
+    imb_ver = cc.get_define('IMB_VERSION_STR',
+        prefix : '#include<intel-ipsec-mb.h>').split('"')[1]
 
-	if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
-		reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
-				IMB_required_ver, imb_ver)
-		build = false
-	endif
+    if (imb_ver == '') or (imb_ver.version_compare('<' + IMB_required_ver))
+        reason = 'IPSec_MB version >= @0@ is required, found version @1@'.format(
+                IMB_required_ver, imb_ver)
+        build = false
+    endif
 
 endif
 
diff --git a/drivers/event/dlb2/meson.build b/drivers/event/dlb2/meson.build
index f22638b8e4..5f2d7ccc8b 100644
--- a/drivers/event/dlb2/meson.build
+++ b/drivers/event/dlb2/meson.build
@@ -9,13 +9,13 @@ if not is_linux or not dpdk_conf.has('RTE_ARCH_X86_64')
 endif
 
 sources = files('dlb2.c',
-		'dlb2_iface.c',
-		'dlb2_xstats.c',
-		'pf/dlb2_main.c',
-		'pf/dlb2_pf.c',
-		'pf/base/dlb2_resource.c',
-		'rte_pmd_dlb2.c',
-		'dlb2_selftest.c'
+        'dlb2_iface.c',
+        'dlb2_xstats.c',
+        'pf/dlb2_main.c',
+        'pf/dlb2_pf.c',
+        'pf/base/dlb2_resource.c',
+        'rte_pmd_dlb2.c',
+        'dlb2_selftest.c'
 )
 
 headers = files('rte_pmd_dlb2.h')
diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build
index 85105a210b..4d7d0021ad 100644
--- a/drivers/event/dpaa/meson.build
+++ b/drivers/event/dpaa/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['net_dpaa', 'crypto_dpaa_sec']
 sources = files('dpaa_eventdev.c')
diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build
index 21aff6276a..3553057788 100644
--- a/drivers/event/dpaa2/meson.build
+++ b/drivers/event/dpaa2/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['bus_vdev', 'net_dpaa2', 'crypto_dpaa2_sec']
 sources = files('dpaa2_hw_dpcon.c',
-		'dpaa2_eventdev.c',
-		'dpaa2_eventdev_selftest.c')
+        'dpaa2_eventdev.c',
+        'dpaa2_eventdev_selftest.c')
 
 includes += include_directories('../../crypto/dpaa2_sec/')
diff --git a/drivers/event/dsw/meson.build b/drivers/event/dsw/meson.build
index 60ab13d906..2df0fac4ff 100644
--- a/drivers/event/dsw/meson.build
+++ b/drivers/event/dsw/meson.build
@@ -3,6 +3,6 @@
 
 deps += ['bus_vdev']
 if cc.has_argument('-Wno-format-nonliteral')
-	cflags += '-Wno-format-nonliteral'
+    cflags += '-Wno-format-nonliteral'
 endif
 sources = files('dsw_evdev.c', 'dsw_event.c', 'dsw_xstats.c')
diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build
index 41e367684c..c088554199 100644
--- a/drivers/event/octeontx/meson.build
+++ b/drivers/event/octeontx/meson.build
@@ -2,12 +2,12 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = files('ssovf_worker.c',
-		'ssovf_evdev.c',
-		'ssovf_evdev_selftest.c',
-		'ssovf_probe.c',
-		'timvf_worker.c',
-		'timvf_evdev.c',
-		'timvf_probe.c'
+        'ssovf_evdev.c',
+        'ssovf_evdev_selftest.c',
+        'ssovf_probe.c',
+        'timvf_worker.c',
+        'timvf_evdev.c',
+        'timvf_probe.c'
 )
 
 deps += ['common_octeontx', 'mempool_octeontx', 'bus_vdev', 'net_octeontx']
diff --git a/drivers/event/octeontx2/meson.build b/drivers/event/octeontx2/meson.build
index 22e7e4cb63..f6f9e028ee 100644
--- a/drivers/event/octeontx2/meson.build
+++ b/drivers/event/octeontx2/meson.build
@@ -3,21 +3,21 @@
 #
 
 if not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_worker.c',
-		'otx2_worker_dual.c',
-		'otx2_evdev.c',
-		'otx2_evdev_adptr.c',
-		'otx2_evdev_crypto_adptr.c',
-		'otx2_evdev_irq.c',
-		'otx2_evdev_selftest.c',
-		'otx2_tim_evdev.c',
-		'otx2_tim_worker.c'
-		)
+        'otx2_worker_dual.c',
+        'otx2_evdev.c',
+        'otx2_evdev_adptr.c',
+        'otx2_evdev_crypto_adptr.c',
+        'otx2_evdev_irq.c',
+        'otx2_evdev_selftest.c',
+        'otx2_tim_evdev.c',
+        'otx2_tim_worker.c'
+        )
 
 deps += ['bus_pci', 'common_octeontx2', 'crypto_octeontx2', 'mempool_octeontx2', 'net_octeontx2']
 
diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build
index cc6029c6f0..786d2f4e82 100644
--- a/drivers/event/opdl/meson.build
+++ b/drivers/event/opdl/meson.build
@@ -2,10 +2,10 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = files(
-	'opdl_evdev.c',
-	'opdl_evdev_init.c',
-	'opdl_evdev_xstats.c',
-	'opdl_ring.c',
-	'opdl_test.c',
+        'opdl_evdev.c',
+        'opdl_evdev_init.c',
+        'opdl_evdev_xstats.c',
+        'opdl_ring.c',
+        'opdl_test.c',
 )
 deps += ['bus_vdev']
diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build
index 985012219b..db403b1b8f 100644
--- a/drivers/event/sw/meson.build
+++ b/drivers/event/sw/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = files('sw_evdev_scheduler.c',
-	'sw_evdev_selftest.c',
-	'sw_evdev_worker.c',
-	'sw_evdev_xstats.c',
-	'sw_evdev.c'
+    'sw_evdev_selftest.c',
+    'sw_evdev_worker.c',
+    'sw_evdev_xstats.c',
+    'sw_evdev.c'
 )
 deps += ['hash', 'bus_vdev']
diff --git a/drivers/mempool/bucket/meson.build b/drivers/mempool/bucket/meson.build
index 61de2dc9b9..0051b6ac3c 100644
--- a/drivers/mempool/bucket/meson.build
+++ b/drivers/mempool/bucket/meson.build
@@ -7,8 +7,8 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('rte_mempool_bucket.c')
diff --git a/drivers/mempool/cnxk/meson.build b/drivers/mempool/cnxk/meson.build
index 3282b5e5a6..e28a9e044d 100644
--- a/drivers/mempool/cnxk/meson.build
+++ b/drivers/mempool/cnxk/meson.build
@@ -3,14 +3,16 @@
 #
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit Linux'
+    subdir_done()
 endif
 
-sources = files('cnxk_mempool.c',
-		'cnxk_mempool_ops.c',
-		'cn9k_mempool_ops.c',
-		'cn10k_mempool_ops.c')
+sources = files(
+        'cnxk_mempool.c',
+        'cnxk_mempool_ops.c',
+        'cn9k_mempool_ops.c',
+        'cn10k_mempool_ops.c',
+)
 
 deps += ['eal', 'mbuf', 'kvargs', 'bus_pci', 'common_cnxk', 'mempool']
diff --git a/drivers/mempool/dpaa/meson.build b/drivers/mempool/dpaa/meson.build
index 09f5295d95..c4e9994b83 100644
--- a/drivers/mempool/dpaa/meson.build
+++ b/drivers/mempool/dpaa/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_dpaa']
diff --git a/drivers/mempool/dpaa2/meson.build b/drivers/mempool/dpaa2/meson.build
index 17ad0a8ea7..3d16d44158 100644
--- a/drivers/mempool/dpaa2/meson.build
+++ b/drivers/mempool/dpaa2/meson.build
@@ -2,8 +2,8 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['bus_fslmc']
diff --git a/drivers/mempool/octeontx/meson.build b/drivers/mempool/octeontx/meson.build
index b5695a9329..2b8879d0c9 100644
--- a/drivers/mempool/octeontx/meson.build
+++ b/drivers/mempool/octeontx/meson.build
@@ -2,12 +2,12 @@
 # Copyright(c) 2017 Cavium, Inc
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('octeontx_fpavf.c',
-		'rte_mempool_octeontx.c'
+        'rte_mempool_octeontx.c'
 )
 
 deps += ['mbuf', 'bus_pci', 'common_octeontx']
diff --git a/drivers/mempool/octeontx2/meson.build b/drivers/mempool/octeontx2/meson.build
index 0586321abe..8a89288251 100644
--- a/drivers/mempool/octeontx2/meson.build
+++ b/drivers/mempool/octeontx2/meson.build
@@ -3,20 +3,20 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    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'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_mempool_ops.c',
-		'otx2_mempool.c',
-		'otx2_mempool_irq.c',
-		'otx2_mempool_debug.c'
-		)
+        'otx2_mempool.c',
+        'otx2_mempool_irq.c',
+        'otx2_mempool_debug.c'
+        )
 
 deps += ['eal', 'mbuf', 'kvargs', 'bus_pci', 'common_octeontx2', 'mempool']
diff --git a/drivers/mempool/stack/meson.build b/drivers/mempool/stack/meson.build
index 8425772a42..371cf131b1 100644
--- a/drivers/mempool/stack/meson.build
+++ b/drivers/mempool/stack/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2017-2019 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
+    build = false
+    reason = 'not supported on Windows'
 endif
 
 sources = files('rte_mempool_stack.c')
diff --git a/drivers/net/af_packet/meson.build b/drivers/net/af_packet/meson.build
index 50a2f05d34..c014e9b61b 100644
--- a/drivers/net/af_packet/meson.build
+++ b/drivers/net/af_packet/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('rte_eth_af_packet.c')
diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
index 60ccffabb9..3ed2b29784 100644
--- a/drivers/net/af_xdp/meson.build
+++ b/drivers/net/af_xdp/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2019 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files('rte_eth_af_xdp.c')
 
 bpf_dep = dependency('libbpf', required: false, method: 'pkg-config')
 if not bpf_dep.found()
-	bpf_dep = cc.find_library('bpf', required: false)
+    bpf_dep = cc.find_library('bpf', required: false)
 endif
 
 if bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('linux/if_xdp.h')
-	ext_deps += bpf_dep
-	bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
-			required: false, method: 'pkg-config')
-	if bpf_ver_dep.found()
-		dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
-	endif
+    ext_deps += bpf_dep
+    bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
+            required: false, method: 'pkg-config')
+    if bpf_ver_dep.found()
+        dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
+    endif
 else
-	build = false
-	reason = 'missing dependency, "libbpf"'
+    build = false
+    reason = 'missing dependency, "libbpf"'
 endif
diff --git a/drivers/net/ark/meson.build b/drivers/net/ark/meson.build
index 91e8c0ddac..8d87744c22 100644
--- a/drivers/net/ark/meson.build
+++ b/drivers/net/ark/meson.build
@@ -2,18 +2,20 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
-sources = files('ark_ddm.c',
-	'ark_ethdev.c',
-	'ark_ethdev_rx.c',
-	'ark_ethdev_tx.c',
-	'ark_mpu.c',
-	'ark_pktchkr.c',
-	'ark_pktdir.c',
-	'ark_pktgen.c',
-	'ark_rqp.c',
-	'ark_udm.c')
+sources = files(
+        'ark_ddm.c',
+        'ark_ethdev.c',
+        'ark_ethdev_rx.c',
+        'ark_ethdev_tx.c',
+        'ark_mpu.c',
+        'ark_pktchkr.c',
+        'ark_pktdir.c',
+        'ark_pktgen.c',
+        'ark_rqp.c',
+        'ark_udm.c',
+)
diff --git a/drivers/net/atlantic/meson.build b/drivers/net/atlantic/meson.build
index 01373f868d..bf5e47eaaf 100644
--- a/drivers/net/atlantic/meson.build
+++ b/drivers/net/atlantic/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2018 Aquantia Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files(
-	'atl_rxtx.c',
-	'atl_ethdev.c',
-	'atl_hw_regs.c',
-	'hw_atl/hw_atl_b0.c',
-	'hw_atl/hw_atl_llh.c',
-	'hw_atl/hw_atl_utils_fw2x.c',
-	'hw_atl/hw_atl_utils.c',
-	'rte_pmd_atlantic.c',
+        'atl_rxtx.c',
+        'atl_ethdev.c',
+        'atl_hw_regs.c',
+        'hw_atl/hw_atl_b0.c',
+        'hw_atl/hw_atl_llh.c',
+        'hw_atl/hw_atl_utils_fw2x.c',
+        'hw_atl/hw_atl_utils.c',
+        'rte_pmd_atlantic.c',
 )
diff --git a/drivers/net/avp/meson.build b/drivers/net/avp/meson.build
index 61c8d5b9f0..ea9dd1f20e 100644
--- a/drivers/net/avp/meson.build
+++ b/drivers/net/avp/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('avp_ethdev.c')
 headers = files('rte_avp_common.h', 'rte_avp_fifo.h')
diff --git a/drivers/net/axgbe/meson.build b/drivers/net/axgbe/meson.build
index 198e198767..cd2c747b13 100644
--- a/drivers/net/axgbe/meson.build
+++ b/drivers/net/axgbe/meson.build
@@ -2,19 +2,19 @@
 # Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('axgbe_ethdev.c',
-		'axgbe_dev.c',
-		'axgbe_mdio.c',
-		'axgbe_phy_impl.c',
-		'axgbe_i2c.c',
-		'axgbe_rxtx.c')
+        'axgbe_dev.c',
+        'axgbe_mdio.c',
+        'axgbe_phy_impl.c',
+        'axgbe_i2c.c',
+        'axgbe_rxtx.c')
 
 cflags += '-Wno-cast-qual'
 
 if arch_subdir == 'x86'
-	sources += files('axgbe_rxtx_vec_sse.c')
+    sources += files('axgbe_rxtx_vec_sse.c')
 endif
diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build
index e260b75926..4714ec4935 100644
--- a/drivers/net/bnx2x/meson.build
+++ b/drivers/net/bnx2x/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('zlib', required: false, method: 'pkg-config')
@@ -13,9 +13,9 @@ reason = 'missing dependency, "zlib"'
 ext_deps += dep
 cflags += '-DZLIB_CONST'
 sources = files('bnx2x.c',
-	'bnx2x_ethdev.c',
-	'bnx2x_rxtx.c',
-	'bnx2x_stats.c',
-	'bnx2x_vfpf.c',
-	'ecore_sp.c',
-	'elink.c')
+    'bnx2x_ethdev.c',
+    'bnx2x_rxtx.c',
+    'bnx2x_stats.c',
+    'bnx2x_vfpf.c',
+    'ecore_sp.c',
+    'elink.c')
diff --git a/drivers/net/bnxt/meson.build b/drivers/net/bnxt/meson.build
index 092655697f..0448e12bc3 100644
--- a/drivers/net/bnxt/meson.build
+++ b/drivers/net/bnxt/meson.build
@@ -3,9 +3,9 @@
 # Copyright(c) 2020 Broadcom
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 headers = files('rte_pmd_bnxt.h')
@@ -14,72 +14,72 @@ includes += include_directories('tf_ulp')
 includes += include_directories('tf_core')
 
 sources = files('bnxt_cpr.c',
-	'bnxt_ethdev.c',
-	'bnxt_filter.c',
-	'bnxt_flow.c',
-	'bnxt_hwrm.c',
-	'bnxt_irq.c',
-	'bnxt_ring.c',
-	'bnxt_rxq.c',
-	'bnxt_rxr.c',
-	'bnxt_stats.c',
-	'bnxt_txq.c',
-	'bnxt_txr.c',
-	'bnxt_util.c',
-	'bnxt_vnic.c',
-	'bnxt_reps.c',
+    'bnxt_ethdev.c',
+    'bnxt_filter.c',
+    'bnxt_flow.c',
+    'bnxt_hwrm.c',
+    'bnxt_irq.c',
+    'bnxt_ring.c',
+    'bnxt_rxq.c',
+    'bnxt_rxr.c',
+    'bnxt_stats.c',
+    'bnxt_txq.c',
+    'bnxt_txr.c',
+    'bnxt_util.c',
+    'bnxt_vnic.c',
+    'bnxt_reps.c',
 
-	'tf_core/tf_core.c',
-	'tf_core/bitalloc.c',
-	'tf_core/tf_msg.c',
-	'tf_core/rand.c',
-	'tf_core/stack.c',
+    'tf_core/tf_core.c',
+    'tf_core/bitalloc.c',
+    'tf_core/tf_msg.c',
+    'tf_core/rand.c',
+    'tf_core/stack.c',
         'tf_core/tf_em_common.c',
         'tf_core/tf_em_internal.c',
-	'tf_core/tf_rm.c',
-	'tf_core/tf_tbl.c',
-	'tf_core/tfp.c',
-	'tf_core/tf_session.c',
-	'tf_core/tf_device.c',
-	'tf_core/tf_device_p4.c',
-	'tf_core/tf_identifier.c',
-	'tf_core/tf_shadow_tbl.c',
-	'tf_core/tf_shadow_tcam.c',
-	'tf_core/tf_tcam.c',
-	'tf_core/tf_util.c',
-	'tf_core/tf_if_tbl.c',
-	'tf_core/ll.c',
-	'tf_core/tf_global_cfg.c',
-	'tf_core/tf_em_host.c',
-	'tf_core/tf_shadow_identifier.c',
-	'tf_core/tf_hash.c',
+    'tf_core/tf_rm.c',
+    'tf_core/tf_tbl.c',
+    'tf_core/tfp.c',
+    'tf_core/tf_session.c',
+    'tf_core/tf_device.c',
+    'tf_core/tf_device_p4.c',
+    'tf_core/tf_identifier.c',
+    'tf_core/tf_shadow_tbl.c',
+    'tf_core/tf_shadow_tcam.c',
+    'tf_core/tf_tcam.c',
+    'tf_core/tf_util.c',
+    'tf_core/tf_if_tbl.c',
+    'tf_core/ll.c',
+    'tf_core/tf_global_cfg.c',
+    'tf_core/tf_em_host.c',
+    'tf_core/tf_shadow_identifier.c',
+    'tf_core/tf_hash.c',
 
-	'hcapi/hcapi_cfa_p4.c',
+    'hcapi/hcapi_cfa_p4.c',
 
-	'tf_ulp/bnxt_ulp.c',
-	'tf_ulp/ulp_mark_mgr.c',
-	'tf_ulp/ulp_flow_db.c',
-	'tf_ulp/ulp_template_db_tbl.c',
-	'tf_ulp/ulp_template_db_class.c',
-	'tf_ulp/ulp_template_db_act.c',
-	'tf_ulp/ulp_utils.c',
-	'tf_ulp/ulp_mapper.c',
-	'tf_ulp/ulp_matcher.c',
-	'tf_ulp/ulp_rte_parser.c',
-	'tf_ulp/bnxt_ulp_flow.c',
-	'tf_ulp/ulp_port_db.c',
-	'tf_ulp/ulp_def_rules.c',
-	'tf_ulp/ulp_fc_mgr.c',
-	'tf_ulp/ulp_tun.c',
-	'tf_ulp/ulp_template_db_wh_plus_act.c',
-	'tf_ulp/ulp_template_db_wh_plus_class.c',
-	'tf_ulp/ulp_template_db_stingray_act.c',
-	'tf_ulp/ulp_template_db_stingray_class.c',
+    'tf_ulp/bnxt_ulp.c',
+    'tf_ulp/ulp_mark_mgr.c',
+    'tf_ulp/ulp_flow_db.c',
+    'tf_ulp/ulp_template_db_tbl.c',
+    'tf_ulp/ulp_template_db_class.c',
+    'tf_ulp/ulp_template_db_act.c',
+    'tf_ulp/ulp_utils.c',
+    'tf_ulp/ulp_mapper.c',
+    'tf_ulp/ulp_matcher.c',
+    'tf_ulp/ulp_rte_parser.c',
+    'tf_ulp/bnxt_ulp_flow.c',
+    'tf_ulp/ulp_port_db.c',
+    'tf_ulp/ulp_def_rules.c',
+    'tf_ulp/ulp_fc_mgr.c',
+    'tf_ulp/ulp_tun.c',
+    'tf_ulp/ulp_template_db_wh_plus_act.c',
+    'tf_ulp/ulp_template_db_wh_plus_class.c',
+    'tf_ulp/ulp_template_db_stingray_act.c',
+    'tf_ulp/ulp_template_db_stingray_class.c',
 
-	'rte_pmd_bnxt.c')
+    'rte_pmd_bnxt.c')
 
 if arch_subdir == 'x86'
-	sources += files('bnxt_rxtx_vec_sse.c')
+    sources += files('bnxt_rxtx_vec_sse.c')
 elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
-	sources += files('bnxt_rxtx_vec_neon.c')
+    sources += files('bnxt_rxtx_vec_neon.c')
 endif
diff --git a/drivers/net/bonding/meson.build b/drivers/net/bonding/meson.build
index 4682903a6f..67d7ab9d91 100644
--- a/drivers/net/bonding/meson.build
+++ b/drivers/net/bonding/meson.build
@@ -2,14 +2,14 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 name = 'bond' #, james bond :-)
 sources = files('rte_eth_bond_api.c', 'rte_eth_bond_pmd.c', 'rte_eth_bond_flow.c',
-	'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c')
+    'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c')
 
 deps += 'sched' # needed for rte_bitmap.h
 deps += ['ip_frag']
diff --git a/drivers/net/cxgbe/meson.build b/drivers/net/cxgbe/meson.build
index 52896ea85c..5f6f7451a5 100644
--- a/drivers/net/cxgbe/meson.build
+++ b/drivers/net/cxgbe/meson.build
@@ -2,22 +2,22 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files('cxgbe_ethdev.c',
-	'cxgbe_main.c',
-	'cxgbevf_ethdev.c',
-	'cxgbevf_main.c',
-	'sge.c',
-	'cxgbe_filter.c',
-	'cxgbe_flow.c',
-	'clip_tbl.c',
-	'mps_tcam.c',
-	'l2t.c',
-	'smt.c',
-	'base/t4_hw.c',
-	'base/t4vf_hw.c')
+    'cxgbe_main.c',
+    'cxgbevf_ethdev.c',
+    'cxgbevf_main.c',
+    'sge.c',
+    'cxgbe_filter.c',
+    'cxgbe_flow.c',
+    'clip_tbl.c',
+    'mps_tcam.c',
+    'l2t.c',
+    'smt.c',
+    'base/t4_hw.c',
+    'base/t4vf_hw.c')
 includes += include_directories('base')
diff --git a/drivers/net/dpaa/meson.build b/drivers/net/dpaa/meson.build
index 0f72730b03..62989b24af 100644
--- a/drivers/net/dpaa/meson.build
+++ b/drivers/net/dpaa/meson.build
@@ -2,20 +2,20 @@
 # Copyright 2018-2020 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['mempool_dpaa']
 
 sources = files('dpaa_ethdev.c',
-		'fmlib/fm_lib.c',
-		'fmlib/fm_vsp.c',
-		'dpaa_flow.c',
-		'dpaa_rxtx.c',
-		'dpaa_fmc.c')
+        'fmlib/fm_lib.c',
+        'fmlib/fm_vsp.c',
+        'dpaa_flow.c',
+        'dpaa_rxtx.c',
+        'dpaa_fmc.c')
 
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 headers = files('rte_pmd_dpaa.h')
diff --git a/drivers/net/dpaa2/meson.build b/drivers/net/dpaa2/meson.build
index f5f411d592..84319d2dbb 100644
--- a/drivers/net/dpaa2/meson.build
+++ b/drivers/net/dpaa2/meson.build
@@ -2,23 +2,23 @@
 # Copyright 2018-2021 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['mempool_dpaa2']
 sources = files('base/dpaa2_hw_dpni.c',
-		'dpaa2_tm.c',
-		'dpaa2_mux.c',
-		'dpaa2_ethdev.c',
-		'dpaa2_flow.c',
-		'dpaa2_rxtx.c',
-		'dpaa2_sparser.c',
-		'dpaa2_ptp.c',
-		'mc/dprtc.c',
-		'mc/dpkg.c',
-		'mc/dpdmux.c',
-		'mc/dpni.c')
+        'dpaa2_tm.c',
+        'dpaa2_mux.c',
+        'dpaa2_ethdev.c',
+        'dpaa2_flow.c',
+        'dpaa2_rxtx.c',
+        'dpaa2_sparser.c',
+        'dpaa2_ptp.c',
+        'mc/dprtc.c',
+        'mc/dpkg.c',
+        'mc/dpdmux.c',
+        'mc/dpni.c')
 
 includes += include_directories('base', 'mc')
 
diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build
index d13f693d3e..99468764e4 100644
--- a/drivers/net/e1000/base/meson.build
+++ b/drivers/net/e1000/base/meson.build
@@ -2,37 +2,37 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = [
-	'e1000_base.c',
-	'e1000_80003es2lan.c',
-	'e1000_82540.c',
-	'e1000_82541.c',
-	'e1000_82542.c',
-	'e1000_82543.c',
-	'e1000_82571.c',
-	'e1000_82575.c',
-	'e1000_api.c',
-	'e1000_i210.c',
-	'e1000_ich8lan.c',
-	'e1000_mac.c',
-	'e1000_manage.c',
-	'e1000_mbx.c',
-	'e1000_nvm.c',
-	'e1000_osdep.c',
-	'e1000_phy.c',
-	'e1000_vf.c'
+        'e1000_base.c',
+        'e1000_80003es2lan.c',
+        'e1000_82540.c',
+        'e1000_82541.c',
+        'e1000_82542.c',
+        'e1000_82543.c',
+        'e1000_82571.c',
+        'e1000_82575.c',
+        'e1000_api.c',
+        'e1000_i210.c',
+        'e1000_ich8lan.c',
+        'e1000_mac.c',
+        'e1000_manage.c',
+        'e1000_mbx.c',
+        'e1000_nvm.c',
+        'e1000_osdep.c',
+        'e1000_phy.c',
+        'e1000_vf.c'
 ]
 
 error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',
-	'-Wno-unused-variable', '-Wno-misleading-indentation',
-	'-Wno-implicit-fallthrough']
+    '-Wno-unused-variable', '-Wno-misleading-indentation',
+    '-Wno-implicit-fallthrough']
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('e1000_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/e1000/meson.build b/drivers/net/e1000/meson.build
index 43ad52cbc0..ebc05f7e2e 100644
--- a/drivers/net/e1000/meson.build
+++ b/drivers/net/e1000/meson.build
@@ -2,22 +2,22 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'e1000_logs.c',
-	'em_ethdev.c',
-	'em_rxtx.c',
-	'igb_ethdev.c',
-	'igb_flow.c',
-	'igb_pf.c',
-	'igb_rxtx.c'
+        'e1000_logs.c',
+        'em_ethdev.c',
+        'em_rxtx.c',
+        'igb_ethdev.c',
+        'igb_flow.c',
+        'igb_pf.c',
+        'igb_rxtx.c'
 )
 
 includes += include_directories('base')
diff --git a/drivers/net/ena/meson.build b/drivers/net/ena/meson.build
index 772fbfc88e..d57b506a67 100644
--- a/drivers/net/ena/meson.build
+++ b/drivers/net/ena/meson.build
@@ -2,14 +2,14 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files('ena_ethdev.c',
-	'base/ena_com.c',
-	'base/ena_eth_com.c')
+    'base/ena_com.c',
+    'base/ena_eth_com.c')
 
 deps += ['timer']
 
diff --git a/drivers/net/enetc/meson.build b/drivers/net/enetc/meson.build
index 850307c04e..1cfe6a089a 100644
--- a/drivers/net/enetc/meson.build
+++ b/drivers/net/enetc/meson.build
@@ -2,12 +2,12 @@
 # Copyright 2018 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 deps += ['common_dpaax']
 sources = files('enetc_ethdev.c',
-		'enetc_rxtx.c')
+        'enetc_rxtx.c')
 
 includes += include_directories('base')
diff --git a/drivers/net/enic/meson.build b/drivers/net/enic/meson.build
index 94fcc79c69..c9ff509c0d 100644
--- a/drivers/net/enic/meson.build
+++ b/drivers/net/enic/meson.build
@@ -2,40 +2,40 @@
 # Copyright(c) 2018 Cisco Systems, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files(
-	'base/vnic_cq.c',
-	'base/vnic_dev.c',
-	'base/vnic_intr.c',
-	'base/vnic_rq.c',
-	'base/vnic_wq.c',
-	'enic_ethdev.c',
-	'enic_flow.c',
-	'enic_fm_flow.c',
-	'enic_main.c',
-	'enic_res.c',
-	'enic_rxtx.c',
-	'enic_vf_representor.c',
-	)
+        'base/vnic_cq.c',
+        'base/vnic_dev.c',
+        'base/vnic_intr.c',
+        'base/vnic_rq.c',
+        'base/vnic_wq.c',
+        'enic_ethdev.c',
+        'enic_flow.c',
+        'enic_fm_flow.c',
+        'enic_main.c',
+        'enic_res.c',
+        'enic_rxtx.c',
+        'enic_vf_representor.c',
+    )
 deps += ['hash']
 includes += include_directories('base')
 
 # The current implementation assumes 64-bit pointers
 if cc.get_define('__AVX2__', args: machine_args) != '' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('enic_rxtx_vec_avx2.c')
+    sources += files('enic_rxtx_vec_avx2.c')
 # Build the avx2 handler if the compiler supports it, even though 'machine'
 # does not. This is to support users who build for the min supported machine
 # and need to run the binary on newer CPUs too.
 # This part is from i40e meson.build
 elif cc.has_argument('-mavx2') and dpdk_conf.get('RTE_ARCH_64')
-	enic_avx2_lib = static_library('enic_avx2_lib',
-			'enic_rxtx_vec_avx2.c',
-			dependencies: [static_rte_ethdev, static_rte_bus_pci],
-			include_directories: includes,
-			c_args: [cflags, '-mavx2'])
-	objs += enic_avx2_lib.extract_objects('enic_rxtx_vec_avx2.c')
+    enic_avx2_lib = static_library('enic_avx2_lib',
+            'enic_rxtx_vec_avx2.c',
+            dependencies: [static_rte_ethdev, static_rte_bus_pci],
+            include_directories: includes,
+            c_args: [cflags, '-mavx2'])
+    objs += enic_avx2_lib.extract_objects('enic_rxtx_vec_avx2.c')
 endif
diff --git a/drivers/net/failsafe/meson.build b/drivers/net/failsafe/meson.build
index d8343be63c..5f6967bd8e 100644
--- a/drivers/net/failsafe/meson.build
+++ b/drivers/net/failsafe/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 cflags += '-std=gnu99'
@@ -12,16 +12,16 @@ cflags += '-D_DEFAULT_SOURCE'
 cflags += '-D_XOPEN_SOURCE=700'
 cflags += '-pedantic'
 if is_linux
-	cflags += '-DLINUX'
+    cflags += '-DLINUX'
 else
-	cflags += '-DBSD'
+    cflags += '-DBSD'
 endif
 
 sources = files('failsafe_args.c',
-	'failsafe.c',
-	'failsafe_eal.c',
-	'failsafe_ether.c',
-	'failsafe_flow.c',
-	'failsafe_intr.c',
-	'failsafe_ops.c',
-	'failsafe_rxtx.c')
+    'failsafe.c',
+    'failsafe_eal.c',
+    'failsafe_ether.c',
+    'failsafe_flow.c',
+    'failsafe_intr.c',
+    'failsafe_ops.c',
+    'failsafe_rxtx.c')
diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build
index 6ac11b2012..6467a1278d 100644
--- a/drivers/net/fm10k/base/meson.build
+++ b/drivers/net/fm10k/base/meson.build
@@ -2,27 +2,27 @@
 # Copyright(c) 2017 Intel Corporation
 
 sources = [
-	'fm10k_api.c',
-	'fm10k_common.c',
-	'fm10k_mbx.c',
-	'fm10k_pf.c',
-	'fm10k_tlv.c',
-	'fm10k_vf.c'
+        'fm10k_api.c',
+        'fm10k_common.c',
+        'fm10k_mbx.c',
+        'fm10k_pf.c',
+        'fm10k_tlv.c',
+        'fm10k_vf.c'
 ]
 
 error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value',
-	'-Wno-strict-aliasing', '-Wno-format-extra-args',
-	'-Wno-unused-variable',
-	'-Wno-implicit-fallthrough'
+    '-Wno-strict-aliasing', '-Wno-format-extra-args',
+    '-Wno-unused-variable',
+    '-Wno-implicit-fallthrough'
 ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('fm10k_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/fm10k/meson.build b/drivers/net/fm10k/meson.build
index 299b9ffb58..69566add96 100644
--- a/drivers/net/fm10k/meson.build
+++ b/drivers/net/fm10k/meson.build
@@ -2,20 +2,20 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'fm10k_ethdev.c',
-	'fm10k_rxtx.c',
+        'fm10k_ethdev.c',
+        'fm10k_rxtx.c',
 )
 if arch_subdir == 'x86'
-	sources += files('fm10k_rxtx_vec.c')
+    sources += files('fm10k_rxtx_vec.c')
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/hinic/base/meson.build b/drivers/net/hinic/base/meson.build
index 6cf947f841..a00c90c14e 100644
--- a/drivers/net/hinic/base/meson.build
+++ b/drivers/net/hinic/base/meson.build
@@ -2,17 +2,17 @@
 # Copyright(c) 2017 Huawei Technologies Co., Ltd
 
 sources = [
-	'hinic_pmd_api_cmd.c',
-	'hinic_pmd_cfg.c',
-	'hinic_pmd_cmdq.c',
-	'hinic_pmd_eqs.c',
-	'hinic_pmd_hwdev.c',
-	'hinic_pmd_hwif.c',
-	'hinic_pmd_mgmt.c',
-	'hinic_pmd_niccfg.c',
-	'hinic_pmd_nicio.c',
-	'hinic_pmd_wq.c',
- 	'hinic_pmd_mbox.c',
+        'hinic_pmd_api_cmd.c',
+        'hinic_pmd_cfg.c',
+        'hinic_pmd_cmdq.c',
+        'hinic_pmd_eqs.c',
+        'hinic_pmd_hwdev.c',
+        'hinic_pmd_hwif.c',
+        'hinic_pmd_mgmt.c',
+        'hinic_pmd_niccfg.c',
+        'hinic_pmd_nicio.c',
+        'hinic_pmd_wq.c',
+        'hinic_pmd_mbox.c',
 ]
 
 extra_flags = []
@@ -32,6 +32,6 @@ deps += ['hash']
 c_args = cflags
 
 base_lib = static_library('hinic_base', sources,
-	dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
-	c_args: c_args)
+    dependencies: [static_rte_eal, static_rte_ethdev, static_rte_bus_pci, static_rte_hash],
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
index 61ea3954ca..0fbfa43bf2 100644
--- a/drivers/net/hinic/meson.build
+++ b/drivers/net/hinic/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2017 Huawei Technologies Co., Ltd
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'hinic_pmd_ethdev.c',
-	'hinic_pmd_rx.c',
-	'hinic_pmd_tx.c',
- 	'hinic_pmd_flow.c',
-	)
+        'hinic_pmd_ethdev.c',
+        'hinic_pmd_rx.c',
+        'hinic_pmd_tx.c',
+        'hinic_pmd_flow.c',
+    )
 
 includes += include_directories('base')
diff --git a/drivers/net/hns3/meson.build b/drivers/net/hns3/meson.build
index dc0baf7678..53c7df7daf 100644
--- a/drivers/net/hns3/meson.build
+++ b/drivers/net/hns3/meson.build
@@ -2,38 +2,40 @@
 # Copyright(c) 2018-2021 Hisilicon Limited
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 if arch_subdir != 'x86' and arch_subdir != 'arm' or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
-	subdir_done()
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
+    subdir_done()
 endif
 
-sources = files('hns3_cmd.c',
-	'hns3_dcb.c',
-	'hns3_intr.c',
-	'hns3_ethdev.c',
-	'hns3_ethdev_vf.c',
-	'hns3_fdir.c',
-	'hns3_flow.c',
-	'hns3_mbx.c',
-	'hns3_regs.c',
-	'hns3_rss.c',
-	'hns3_rxtx.c',
-	'hns3_stats.c',
-	'hns3_mp.c',
-	'hns3_tm.c',
-	'hns3_ptp.c')
+sources = files(
+        'hns3_cmd.c',
+        'hns3_dcb.c',
+        'hns3_intr.c',
+        'hns3_ethdev.c',
+        'hns3_ethdev_vf.c',
+        'hns3_fdir.c',
+        'hns3_flow.c',
+        'hns3_mbx.c',
+        'hns3_regs.c',
+        'hns3_rss.c',
+        'hns3_rxtx.c',
+        'hns3_stats.c',
+        'hns3_mp.c',
+        'hns3_tm.c',
+        'hns3_ptp.c',
+)
 
 deps += ['hash']
 
 if arch_subdir == 'arm' and dpdk_conf.get('RTE_ARCH_64')
-	sources += files('hns3_rxtx_vec.c')
-	if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != ''
-		sources += files('hns3_rxtx_vec_sve.c')
-	endif
+    sources += files('hns3_rxtx_vec.c')
+    if cc.get_define('__ARM_FEATURE_SVE', args: machine_args) != ''
+        sources += files('hns3_rxtx_vec_sve.c')
+    endif
 endif
diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build
index 8bc6a0fa0b..c319902cd8 100644
--- a/drivers/net/i40e/base/meson.build
+++ b/drivers/net/i40e/base/meson.build
@@ -2,29 +2,29 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-	'i40e_adminq.c',
-	'i40e_common.c',
-	'i40e_dcb.c',
-	'i40e_diag.c',
-	'i40e_hmc.c',
-	'i40e_lan_hmc.c',
-	'i40e_nvm.c'
+        'i40e_adminq.c',
+        'i40e_common.c',
+        'i40e_dcb.c',
+        'i40e_diag.c',
+        'i40e_hmc.c',
+        'i40e_lan_hmc.c',
+        'i40e_nvm.c'
 ]
 
 error_cflags = ['-Wno-sign-compare', '-Wno-unused-value',
-		'-Wno-format', '-Wno-format-security',
-		'-Wno-format-nonliteral',
-		'-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
-		'-Wno-unused-parameter',
+        '-Wno-format', '-Wno-format-security',
+        '-Wno-format-nonliteral',
+        '-Wno-strict-aliasing', '-Wno-unused-but-set-variable',
+        '-Wno-unused-parameter',
 ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('i40e_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/i40e/meson.build b/drivers/net/i40e/meson.build
index ce3cc658e9..7b4f6db5a4 100644
--- a/drivers/net/i40e/meson.build
+++ b/drivers/net/i40e/meson.build
@@ -2,76 +2,76 @@
 # Copyright(c) 2017 Intel Corporation
 
 cflags += ['-DPF_DRIVER',
-	'-DVF_DRIVER',
-	'-DINTEGRATED_VF',
-	'-DX722_A0_SUPPORT']
+    '-DVF_DRIVER',
+    '-DINTEGRATED_VF',
+    '-DX722_A0_SUPPORT']
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'i40e_ethdev.c',
-	'i40e_rxtx.c',
-	'i40e_ethdev_vf.c',
-	'i40e_pf.c',
-	'i40e_fdir.c',
-	'i40e_flow.c',
-	'i40e_tm.c',
-	'i40e_hash.c',
-	'i40e_vf_representor.c',
-	'rte_pmd_i40e.c'
-	)
+        'i40e_ethdev.c',
+        'i40e_rxtx.c',
+        'i40e_ethdev_vf.c',
+        'i40e_pf.c',
+        'i40e_fdir.c',
+        'i40e_flow.c',
+        'i40e_tm.c',
+        'i40e_hash.c',
+        'i40e_vf_representor.c',
+        'rte_pmd_i40e.c'
+    )
 
 deps += ['hash']
 includes += include_directories('base')
 
 if arch_subdir == 'x86'
-	sources += files('i40e_rxtx_vec_sse.c')
+    sources += files('i40e_rxtx_vec_sse.c')
 
-	if is_windows and cc.get_id() != 'clang'
-		cflags += ['-fno-asynchronous-unwind-tables']
-	endif
+    if is_windows and cc.get_id() != 'clang'
+        cflags += ['-fno-asynchronous-unwind-tables']
+    endif
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('i40e_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		i40e_avx2_lib = static_library('i40e_avx2_lib',
-				'i40e_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('i40e_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        i40e_avx2_lib = static_library('i40e_avx2_lib',
+                'i40e_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += i40e_avx2_lib.extract_objects('i40e_rxtx_vec_avx2.c')
+    endif
 
-	i40e_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    i40e_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	i40e_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    i40e_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		i40e_avx512_lib = static_library('i40e_avx512_lib',
-				'i40e_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
-	endif
+    if i40e_avx512_cpu_support == true or i40e_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        i40e_avx512_lib = static_library('i40e_avx512_lib',
+                'i40e_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += i40e_avx512_lib.extract_objects('i40e_rxtx_vec_avx512.c')
+    endif
 elif arch_subdir == 'ppc'
        sources += files('i40e_rxtx_vec_altivec.c')
 elif arch_subdir == 'arm'
diff --git a/drivers/net/iavf/meson.build b/drivers/net/iavf/meson.build
index ac2af81f75..6f222a9e87 100644
--- a/drivers/net/iavf/meson.build
+++ b/drivers/net/iavf/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 cflags += ['-Wno-strict-aliasing']
@@ -13,57 +13,57 @@ includes += include_directories('../../common/iavf')
 deps += ['common_iavf']
 
 sources = files(
-	'iavf_ethdev.c',
-	'iavf_rxtx.c',
-	'iavf_vchnl.c',
-	'iavf_generic_flow.c',
-	'iavf_fdir.c',
-	'iavf_hash.c',
+        'iavf_ethdev.c',
+        'iavf_rxtx.c',
+        'iavf_vchnl.c',
+        'iavf_generic_flow.c',
+        'iavf_fdir.c',
+        'iavf_hash.c',
 )
 
 if arch_subdir == 'x86'
-	sources += files('iavf_rxtx_vec_sse.c')
+    sources += files('iavf_rxtx_vec_sse.c')
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('iavf_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		iavf_avx2_lib = static_library('iavf_avx2_lib',
-				'iavf_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('iavf_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        iavf_avx2_lib = static_library('iavf_avx2_lib',
+                'iavf_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += iavf_avx2_lib.extract_objects('iavf_rxtx_vec_avx2.c')
+    endif
 
-	iavf_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    iavf_avx512_cpu_support = (
+        cc.get_define('__AVX512F__', args: machine_args) != '' and
+        cc.get_define('__AVX512BW__', args: machine_args) != '')
 
-	iavf_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    iavf_avx512_cc_support = (
+        not machine_args.contains('-mno-avx512f') and
+        cc.has_argument('-mavx512f') and
+        cc.has_argument('-mavx512bw'))
 
-	if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		iavf_avx512_lib = static_library('iavf_avx512_lib',
-				'iavf_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
-	endif
+    if iavf_avx512_cpu_support == true or iavf_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        iavf_avx512_lib = static_library('iavf_avx512_lib',
+                'iavf_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += iavf_avx512_lib.extract_objects('iavf_rxtx_vec_avx512.c')
+    endif
 endif
 
 headers = files('rte_pmd_iavf.h')
diff --git a/drivers/net/ice/base/meson.build b/drivers/net/ice/base/meson.build
index c44d0e035d..6c548a9977 100644
--- a/drivers/net/ice/base/meson.build
+++ b/drivers/net/ice/base/meson.build
@@ -2,39 +2,40 @@
 # Copyright(c) 2018-2021 Intel Corporation
 
 sources = [
-	'ice_controlq.c',
-	'ice_common.c',
-	'ice_sched.c',
-	'ice_switch.c',
-	'ice_nvm.c',
-	'ice_flex_pipe.c',
-	'ice_flow.c',
-	'ice_dcb.c',
-	'ice_fdir.c',
-	'ice_acl.c',
-	'ice_acl_ctrl.c',
-	'ice_vlan_mode.c',
+        'ice_controlq.c',
+        'ice_common.c',
+        'ice_sched.c',
+        'ice_switch.c',
+        'ice_nvm.c',
+        'ice_flex_pipe.c',
+        'ice_flow.c',
+        'ice_dcb.c',
+        'ice_fdir.c',
+        'ice_acl.c',
+        'ice_acl_ctrl.c',
+        'ice_vlan_mode.c',
 ]
 
-error_cflags = ['-Wno-unused-value',
-		'-Wno-unused-but-set-variable',
-		'-Wno-unused-variable',
-		'-Wno-unused-parameter',
+error_cflags = [
+        '-Wno-unused-value',
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-variable',
+        '-Wno-unused-parameter',
 ]
 
 if is_windows and cc.get_id() != 'clang'
-	cflags += ['-fno-asynchronous-unwind-tables']
+    cflags += ['-fno-asynchronous-unwind-tables']
 endif
 
 c_args = cflags
 
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('ice_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+        dependencies: static_rte_eal,
+        c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/ice/meson.build b/drivers/net/ice/meson.build
index b2d0b66219..575b664a04 100644
--- a/drivers/net/ice/meson.build
+++ b/drivers/net/ice/meson.build
@@ -5,70 +5,71 @@ subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'ice_ethdev.c',
-	'ice_rxtx.c',
-	'ice_switch_filter.c',
-	'ice_generic_flow.c',
-	'ice_fdir_filter.c',
-	'ice_hash.c',
-	'ice_acl_filter.c'
-	)
+        'ice_ethdev.c',
+        'ice_rxtx.c',
+        'ice_switch_filter.c',
+        'ice_generic_flow.c',
+        'ice_fdir_filter.c',
+        'ice_hash.c',
+        'ice_acl_filter.c'
+)
 
 deps += ['hash', 'net', 'common_iavf']
 includes += include_directories('base', '../../common/iavf')
 
 if arch_subdir == 'x86'
-	sources += files('ice_rxtx_vec_sse.c')
+    sources += files('ice_rxtx_vec_sse.c')
 
-	if is_windows and cc.get_id() != 'clang'
-		cflags += ['-fno-asynchronous-unwind-tables']
-	endif
+    if is_windows and cc.get_id() != 'clang'
+        cflags += ['-fno-asynchronous-unwind-tables']
+    endif
 
-	# compile AVX2 version if either:
-	# a. we have AVX supported in minimum instruction set baseline
-	# b. it's not minimum instruction set, but supported by compiler
-	if cc.get_define('__AVX2__', args: machine_args) != ''
-		cflags += ['-DCC_AVX2_SUPPORT']
-		sources += files('ice_rxtx_vec_avx2.c')
-	elif cc.has_argument('-mavx2')
-		cflags += ['-DCC_AVX2_SUPPORT']
-		ice_avx2_lib = static_library('ice_avx2_lib',
-				'ice_rxtx_vec_avx2.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: [cflags, '-mavx2'])
-		objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
-	endif
+    # compile AVX2 version if either:
+    # a. we have AVX supported in minimum instruction set baseline
+    # b. it's not minimum instruction set, but supported by compiler
+    if cc.get_define('__AVX2__', args: machine_args) != ''
+        cflags += ['-DCC_AVX2_SUPPORT']
+        sources += files('ice_rxtx_vec_avx2.c')
+    elif cc.has_argument('-mavx2')
+        cflags += ['-DCC_AVX2_SUPPORT']
+        ice_avx2_lib = static_library('ice_avx2_lib',
+                'ice_rxtx_vec_avx2.c',
+                dependencies: [static_rte_ethdev, static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: [cflags, '-mavx2'])
+        objs += ice_avx2_lib.extract_objects('ice_rxtx_vec_avx2.c')
+    endif
 
-	ice_avx512_cpu_support = (
-		cc.get_define('__AVX512F__', args: machine_args) != '' and
-		cc.get_define('__AVX512BW__', args: machine_args) != '')
+    ice_avx512_cpu_support = (
+            cc.get_define('__AVX512F__', args: machine_args) != '' and
+                cc.get_define('__AVX512BW__', args: machine_args) != ''
+    )
 
-	ice_avx512_cc_support = (
-		not machine_args.contains('-mno-avx512f') and
-		cc.has_argument('-mavx512f') and
-		cc.has_argument('-mavx512bw'))
+    ice_avx512_cc_support = (
+            not machine_args.contains('-mno-avx512f') and
+                cc.has_argument('-mavx512f') and
+                cc.has_argument('-mavx512bw')
+    )
 
-	if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
-		cflags += ['-DCC_AVX512_SUPPORT']
-		avx512_args = [cflags, '-mavx512f', '-mavx512bw']
-		if cc.has_argument('-march=skylake-avx512')
-			avx512_args += '-march=skylake-avx512'
-		endif
-		ice_avx512_lib = static_library('ice_avx512_lib',
-				'ice_rxtx_vec_avx512.c',
-				dependencies: [static_rte_ethdev,
-					static_rte_kvargs, static_rte_hash],
-				include_directories: includes,
-				c_args: avx512_args)
-		objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
-	endif
+    if ice_avx512_cpu_support == true or ice_avx512_cc_support == true
+        cflags += ['-DCC_AVX512_SUPPORT']
+        avx512_args = [cflags, '-mavx512f', '-mavx512bw']
+        if cc.has_argument('-march=skylake-avx512')
+            avx512_args += '-march=skylake-avx512'
+        endif
+        ice_avx512_lib = static_library('ice_avx512_lib',
+                'ice_rxtx_vec_avx512.c',
+                dependencies: [static_rte_ethdev,
+                    static_rte_kvargs, static_rte_hash],
+                include_directories: includes,
+                c_args: avx512_args)
+        objs += ice_avx512_lib.extract_objects('ice_rxtx_vec_avx512.c')
+    endif
 endif
 
 sources += files('ice_dcf.c',
-		 'ice_dcf_vf_representor.c',
-		 'ice_dcf_ethdev.c',
-		 'ice_dcf_parent.c')
+         'ice_dcf_vf_representor.c',
+         'ice_dcf_ethdev.c',
+         'ice_dcf_parent.c')
 
 headers = files('rte_pmd_ice.h')
diff --git a/drivers/net/igc/base/meson.build b/drivers/net/igc/base/meson.build
index 690704fe02..8affc72e65 100644
--- a/drivers/net/igc/base/meson.build
+++ b/drivers/net/igc/base/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 sources = [
-	'igc_api.c',
-	'igc_base.c',
-	'igc_i225.c',
-	'igc_mac.c',
-	'igc_manage.c',
-	'igc_nvm.c',
-	'igc_osdep.c',
-	'igc_phy.c',
+        'igc_api.c',
+        'igc_base.c',
+        'igc_i225.c',
+        'igc_mac.c',
+        'igc_manage.c',
+        'igc_nvm.c',
+        'igc_osdep.c',
+        'igc_phy.c',
 ]
 
 base_lib = static_library('igc_base', sources,
-	dependencies: static_rte_eal,
-	c_args: cflags)
+    dependencies: static_rte_eal,
+    c_args: cflags)
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/igc/meson.build b/drivers/net/igc/meson.build
index b971e6f8c6..925ebd9030 100644
--- a/drivers/net/igc/meson.build
+++ b/drivers/net/igc/meson.build
@@ -2,20 +2,20 @@
 # Copyright(c) 2019-2020 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'igc_logs.c',
-	'igc_ethdev.c',
-	'igc_txrx.c',
-	'igc_filter.c',
-	'igc_flow.c'
+        'igc_logs.c',
+        'igc_ethdev.c',
+        'igc_txrx.c',
+        'igc_filter.c',
+        'igc_flow.c'
 )
 
 includes += include_directories('base')
diff --git a/drivers/net/ionic/meson.build b/drivers/net/ionic/meson.build
index 631ea27f52..cf6771db81 100644
--- a/drivers/net/ionic/meson.build
+++ b/drivers/net/ionic/meson.build
@@ -2,17 +2,17 @@
 # Copyright(c) 2019 Pensando
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files(
-	'ionic_mac_api.c',
-	'ionic_rx_filter.c',
-	'ionic_rxtx.c',
-	'ionic_dev.c',
-	'ionic_ethdev.c',
-	'ionic_lif.c',
-	'ionic_main.c'
+        'ionic_mac_api.c',
+        'ionic_rx_filter.c',
+        'ionic_rxtx.c',
+        'ionic_dev.c',
+        'ionic_ethdev.c',
+        'ionic_lif.c',
+        'ionic_main.c'
 )
diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build
index 65de9d5172..6863cd9041 100644
--- a/drivers/net/ipn3ke/meson.build
+++ b/drivers/net/ipn3ke/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2019 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 #
@@ -16,15 +16,15 @@ endif
 #
 
 if has_libfdt == 0
-	build = false
-	reason = 'missing dependency, "libfdt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libfdt"'
+    subdir_done()
 endif
 
 includes += include_directories('../../raw/ifpga')
 
 sources += files('ipn3ke_ethdev.c',
-	'ipn3ke_representor.c',
-	'ipn3ke_tm.c',
-	'ipn3ke_flow.c')
+    'ipn3ke_representor.c',
+    'ipn3ke_tm.c',
+    'ipn3ke_flow.c')
 deps += ['bus_ifpga', 'ethdev', 'sched']
diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build
index 48bbb86cb8..4d5e41bdeb 100644
--- a/drivers/net/ixgbe/base/meson.build
+++ b/drivers/net/ixgbe/base/meson.build
@@ -2,33 +2,33 @@
 # Copyright(c) 2017-2020 Intel Corporation
 
 sources = [
-	'ixgbe_82598.c',
-	'ixgbe_82599.c',
-	'ixgbe_api.c',
-	'ixgbe_common.c',
-	'ixgbe_dcb_82598.c',
-	'ixgbe_dcb_82599.c',
-	'ixgbe_dcb.c',
-	'ixgbe_hv_vf.c',
-	'ixgbe_mbx.c',
-	'ixgbe_phy.c',
-	'ixgbe_vf.c',
-	'ixgbe_x540.c',
-	'ixgbe_x550.c'
+        'ixgbe_82598.c',
+        'ixgbe_82599.c',
+        'ixgbe_api.c',
+        'ixgbe_common.c',
+        'ixgbe_dcb_82598.c',
+        'ixgbe_dcb_82599.c',
+        'ixgbe_dcb.c',
+        'ixgbe_hv_vf.c',
+        'ixgbe_mbx.c',
+        'ixgbe_phy.c',
+        'ixgbe_vf.c',
+        'ixgbe_x540.c',
+        'ixgbe_x550.c'
 ]
 
 error_cflags = ['-Wno-unused-value',
-		'-Wno-unused-but-set-variable',
-		'-Wno-unused-parameter',
-		]
+        '-Wno-unused-but-set-variable',
+        '-Wno-unused-parameter',
+        ]
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('ixgbe_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/ixgbe/meson.build b/drivers/net/ixgbe/meson.build
index 76cbfb830b..9d93eb802d 100644
--- a/drivers/net/ixgbe/meson.build
+++ b/drivers/net/ixgbe/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 cflags += ['-DRTE_LIBRTE_IXGBE_BYPASS']
@@ -13,25 +13,25 @@ subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'ixgbe_82599_bypass.c',
-	'ixgbe_bypass.c',
-	'ixgbe_ethdev.c',
-	'ixgbe_fdir.c',
-	'ixgbe_flow.c',
-	'ixgbe_ipsec.c',
-	'ixgbe_pf.c',
-	'ixgbe_rxtx.c',
-	'ixgbe_tm.c',
-	'ixgbe_vf_representor.c',
-	'rte_pmd_ixgbe.c'
+        'ixgbe_82599_bypass.c',
+        'ixgbe_bypass.c',
+        'ixgbe_ethdev.c',
+        'ixgbe_fdir.c',
+        'ixgbe_flow.c',
+        'ixgbe_ipsec.c',
+        'ixgbe_pf.c',
+        'ixgbe_rxtx.c',
+        'ixgbe_tm.c',
+        'ixgbe_vf_representor.c',
+        'rte_pmd_ixgbe.c'
 )
 
 deps += ['hash', 'security']
 
 if arch_subdir == 'x86'
-	sources += files('ixgbe_rxtx_vec_sse.c')
+    sources += files('ixgbe_rxtx_vec_sse.c')
 elif arch_subdir == 'arm'
-	sources += files('ixgbe_rxtx_vec_neon.c')
+    sources += files('ixgbe_rxtx_vec_neon.c')
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/kni/meson.build b/drivers/net/kni/meson.build
index 4d5e5fe368..c0751aeb59 100644
--- a/drivers/net/kni/meson.build
+++ b/drivers/net/kni/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 # this driver can be built if-and-only-if KNI library is buildable
diff --git a/drivers/net/liquidio/meson.build b/drivers/net/liquidio/meson.build
index 4965ebe85f..e32029e853 100644
--- a/drivers/net/liquidio/meson.build
+++ b/drivers/net/liquidio/meson.build
@@ -2,13 +2,13 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files('base/lio_23xx_vf.c',
-	'base/lio_mbox.c',
-	'lio_ethdev.c',
-	'lio_rxtx.c')
+    'base/lio_mbox.c',
+    'lio_ethdev.c',
+    'lio_rxtx.c')
 includes += include_directories('base')
diff --git a/drivers/net/memif/meson.build b/drivers/net/memif/meson.build
index 9c3ba432d0..3201f3babb 100644
--- a/drivers/net/memif/meson.build
+++ b/drivers/net/memif/meson.build
@@ -2,11 +2,11 @@
 # Copyright 2018-2019 Cisco Systems, Inc.  All rights reserved.
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 
 sources = files('rte_eth_memif.c',
-		'memif_socket.c')
+        'memif_socket.c')
 
 deps += ['hash']
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index d7602b748e..447bfda541 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -3,9 +3,9 @@
 # Copyright 2018 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 static_ibverbs = (get_option('ibverbs_link') == 'static')
@@ -14,74 +14,74 @@ LIB_GLUE_BASE = 'librte_net_mlx4_glue.so'
 LIB_GLUE_VERSION = abi_version
 LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION
 if dlopen_ibverbs
-	dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
-	cflags += [
-		'-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
-		'-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
-	]
+    dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1)
+    cflags += [
+            '-DMLX4_GLUE="@0@"'.format(LIB_GLUE),
+            '-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION),
+    ]
 endif
 
 libnames = [ 'mlx4', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-	lib = dependency('lib' + libname, static:static_ibverbs,
-			required:false, method: 'pkg-config')
-	if not lib.found() and not static_ibverbs
-		lib = cc.find_library(libname, required:false)
-	endif
-	if lib.found()
-		libs += lib
-		if not static_ibverbs and not dlopen_ibverbs
-			ext_deps += lib
-		endif
-	else
-		build = false
-		reason = 'missing dependency, "' + libname + '"'
-		subdir_done()
-	endif
+    lib = dependency('lib' + libname, static:static_ibverbs,
+            required:false, method: 'pkg-config')
+    if not lib.found() and not static_ibverbs
+        lib = cc.find_library(libname, required:false)
+    endif
+    if lib.found()
+        libs += lib
+        if not static_ibverbs and not dlopen_ibverbs
+            ext_deps += lib
+        endif
+    else
+        build = false
+        reason = 'missing dependency, "' + libname + '"'
+        subdir_done()
+    endif
 endforeach
 if static_ibverbs or dlopen_ibverbs
-	# Build without adding shared libs to Requires.private
-	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
-	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+    # Build without adding shared libs to Requires.private
+    ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+    ext_deps += declare_dependency(compile_args: ibv_cflags.split())
 endif
 if static_ibverbs
-	# Add static deps ldflags to internal apps and Libs.private
-	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
-	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+    # Add static deps ldflags to internal apps and Libs.private
+    ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+    ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 endif
 
 sources = files(
-	'mlx4.c',
-	'mlx4_ethdev.c',
-	'mlx4_flow.c',
-	'mlx4_intr.c',
-	'mlx4_mp.c',
-	'mlx4_mr.c',
-	'mlx4_rxq.c',
-	'mlx4_rxtx.c',
-	'mlx4_txq.c',
-	'mlx4_utils.c',
+        'mlx4.c',
+        'mlx4_ethdev.c',
+        'mlx4_flow.c',
+        'mlx4_intr.c',
+        'mlx4_mp.c',
+        'mlx4_mr.c',
+        'mlx4_rxq.c',
+        'mlx4_rxtx.c',
+        'mlx4_txq.c',
+        'mlx4_utils.c',
 )
 if not dlopen_ibverbs
-	sources += files('mlx4_glue.c')
+    sources += files('mlx4_glue.c')
 endif
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 # To maintain the compatibility with the make build system
 # mlx4_autoconf.h file is still generated.
@@ -90,49 +90,49 @@ endif
 #   "symbol to search", "struct member to search" ]
 #
 has_member_args = [
-	[ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
-	'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
+        [ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h',
+        'struct mlx4_wqe_lso_seg', 'mss_hdr_size' ],
 ]
 # input array for meson symbol search:
 # [ "MACRO to define if found", "header for the search",
 #   "symbol to search" ]
 has_sym_args = [
-	[ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
-	'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
-	[ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
-	'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
+        [ 'HAVE_IBV_MLX4_BUF_ALLOCATORS', 'infiniband/mlx4dv.h',
+        'MLX4DV_SET_CTX_ATTR_BUF_ALLOCATORS' ],
+        [ 'HAVE_IBV_MLX4_UAR_MMAP_OFFSET', 'infiniband/mlx4dv.h',
+        'MLX4DV_QP_MASK_UAR_MMAP_OFFSET' ],
 ]
 config = configuration_data()
 foreach arg:has_sym_args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
-		dependencies: libs))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2],
+        dependencies: libs))
 endforeach
 foreach arg:has_member_args
-	file_prefix = '#include <' + arg[1] + '>'
-	config.set(arg[0], cc.has_member(arg[2], arg[3],
-		prefix: file_prefix, dependencies: libs))
+    file_prefix = '#include <' + arg[1] + '>'
+    config.set(arg[0], cc.has_member(arg[2], arg[3],
+        prefix: file_prefix, dependencies: libs))
 endforeach
 configure_file(output : 'mlx4_autoconf.h', configuration : config)
 
 # Build Glue Library
 if dlopen_ibverbs
-	dlopen_name = 'mlx4_glue'
-	dlopen_lib_name = 'rte_net_' + dlopen_name
-	dlopen_so_version = LIB_GLUE_VERSION
-	dlopen_sources = files('mlx4_glue.c')
-	dlopen_install_dir = [ eal_pmd_path + '-glue' ]
-	shared_lib = shared_library(
-		dlopen_lib_name,
-		dlopen_sources,
-		include_directories: global_inc,
-		c_args: cflags,
-		dependencies: libs,
-		link_args: [
-		'-Wl,-export-dynamic',
-		'-Wl,-h,@0@'.format(LIB_GLUE),
-		],
-		soversion: dlopen_so_version,
-		install: true,
-		install_dir: dlopen_install_dir,
-	)
+    dlopen_name = 'mlx4_glue'
+    dlopen_lib_name = 'rte_net_' + dlopen_name
+    dlopen_so_version = LIB_GLUE_VERSION
+    dlopen_sources = files('mlx4_glue.c')
+    dlopen_install_dir = [ eal_pmd_path + '-glue' ]
+    shared_lib = shared_library(
+        dlopen_lib_name,
+        dlopen_sources,
+        include_directories: global_inc,
+        c_args: cflags,
+        dependencies: libs,
+        link_args: [
+        '-Wl,-export-dynamic',
+        '-Wl,-h,@0@'.format(LIB_GLUE),
+        ],
+        soversion: dlopen_so_version,
+        install: true,
+        install_dir: dlopen_install_dir,
+    )
 endif
diff --git a/drivers/net/mlx5/linux/meson.build b/drivers/net/mlx5/linux/meson.build
index 8412edce78..5530241356 100644
--- a/drivers/net/mlx5/linux/meson.build
+++ b/drivers/net/mlx5/linux/meson.build
@@ -3,12 +3,12 @@
 
 includes += include_directories('.')
 sources += files(
-	'mlx5_socket.c',
-	'mlx5_os.c',
-	'mlx5_ethdev_os.c',
-	'mlx5_verbs.c',
-	'mlx5_mp_os.c',
-	'mlx5_vlan_os.c',
-	'mlx5_flow_os.c',
+        'mlx5_socket.c',
+        'mlx5_os.c',
+        'mlx5_ethdev_os.c',
+        'mlx5_verbs.c',
+        'mlx5_mp_os.c',
+        'mlx5_vlan_os.c',
+        'mlx5_flow_os.c',
 )
 
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 8740ca572e..d5cc50b105 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -3,66 +3,66 @@
 # Copyright 2018 Mellanox Technologies, Ltd
 
 if not (is_linux or is_windows)
-	build = false
-	reason = 'only supported on Linux and Windows'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux and Windows'
+    subdir_done()
 endif
 
 deps += ['hash', 'common_mlx5']
 sources = files(
-	'mlx5.c',
-	'mlx5_ethdev.c',
-	'mlx5_flow.c',
-	'mlx5_flow_meter.c',
-	'mlx5_flow_dv.c',
+        'mlx5.c',
+        'mlx5_ethdev.c',
+        'mlx5_flow.c',
+        'mlx5_flow_meter.c',
+        'mlx5_flow_dv.c',
         'mlx5_flow_age.c',
-	'mlx5_mac.c',
-	'mlx5_mr.c',
-	'mlx5_rss.c',
-	'mlx5_rx.c',
-	'mlx5_rxmode.c',
-	'mlx5_rxq.c',
-	'mlx5_rxtx.c',
-	'mlx5_stats.c',
-	'mlx5_trigger.c',
-	'mlx5_tx.c',
-	'mlx5_tx_empw.c',
-	'mlx5_tx_mpw.c',
-	'mlx5_tx_nompw.c',
-	'mlx5_tx_txpp.c',
-	'mlx5_txq.c',
-	'mlx5_txpp.c',
-	'mlx5_vlan.c',
-	'mlx5_utils.c',
-	'mlx5_devx.c',
+        'mlx5_mac.c',
+        'mlx5_mr.c',
+        'mlx5_rss.c',
+        'mlx5_rx.c',
+        'mlx5_rxmode.c',
+        'mlx5_rxq.c',
+        'mlx5_rxtx.c',
+        'mlx5_stats.c',
+        'mlx5_trigger.c',
+        'mlx5_tx.c',
+        'mlx5_tx_empw.c',
+        'mlx5_tx_mpw.c',
+        'mlx5_tx_nompw.c',
+        'mlx5_tx_txpp.c',
+        'mlx5_txq.c',
+        'mlx5_txpp.c',
+        'mlx5_vlan.c',
+        'mlx5_utils.c',
+        'mlx5_devx.c',
 )
 
 if is_linux
-	sources += files(
-		'mlx5_flow_verbs.c',
-	)
-	if (dpdk_conf.has('RTE_ARCH_X86_64')
-		or dpdk_conf.has('RTE_ARCH_ARM64')
-		or dpdk_conf.has('RTE_ARCH_PPC_64'))
-		sources += files('mlx5_rxtx_vec.c')
-	endif
+    sources += files(
+            'mlx5_flow_verbs.c',
+    )
+    if (dpdk_conf.has('RTE_ARCH_X86_64')
+        or dpdk_conf.has('RTE_ARCH_ARM64')
+        or dpdk_conf.has('RTE_ARCH_PPC_64'))
+        sources += files('mlx5_rxtx_vec.c')
+    endif
 endif
 
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
 subdir(exec_env)
diff --git a/drivers/net/mlx5/windows/meson.build b/drivers/net/mlx5/windows/meson.build
index ddb6c6ca90..c7d6617275 100644
--- a/drivers/net/mlx5/windows/meson.build
+++ b/drivers/net/mlx5/windows/meson.build
@@ -3,9 +3,9 @@
 
 includes += include_directories('.')
 sources += files(
-	'mlx5_os.c',
-	'mlx5_mp_os.c',
-	'mlx5_ethdev_os.c',
-	'mlx5_vlan_os.c',
-	'mlx5_flow_os.c',
+        'mlx5_os.c',
+        'mlx5_mp_os.c',
+        'mlx5_ethdev_os.c',
+        'mlx5_vlan_os.c',
+        'mlx5_flow_os.c',
 )
diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 0be7b3d8ba..87e8bad73e 100644
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -4,23 +4,23 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
 
 sources = files(
-	'mvneta_ethdev.c',
-	'mvneta_rxtx.c'
+        'mvneta_ethdev.c',
+        'mvneta_rxtx.c'
 )
 
 deps += ['cfgfile', 'common_mvep']
diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index bfda5439ba..9727f639e4 100644
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -4,26 +4,26 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
-	build = false
-	reason = 'missing dependency, "libmusdk"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libmusdk"'
+    subdir_done()
 endif
 
 ext_deps += dep
 
 sources = files(
-	'mrvl_ethdev.c',
-	'mrvl_flow.c',
-	'mrvl_qos.c',
-	'mrvl_mtr.c',
-	'mrvl_tm.c'
+        'mrvl_ethdev.c',
+        'mrvl_flow.c',
+        'mrvl_qos.c',
+        'mrvl_mtr.c',
+        'mrvl_tm.c'
 )
 
 deps += ['cfgfile', 'common_mvep']
diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build
index c190124db0..1dac5e512b 100644
--- a/drivers/net/netvsc/meson.build
+++ b/drivers/net/netvsc/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Microsoft Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 build = dpdk_conf.has('RTE_BUS_VMBUS')
diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build
index f4a89b87d5..0af4ddf806 100644
--- a/drivers/net/nfb/meson.build
+++ b/drivers/net/nfb/meson.build
@@ -4,9 +4,9 @@
 # All rights reserved.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('netcope-common', required: false, method: 'pkg-config')
diff --git a/drivers/net/nfp/meson.build b/drivers/net/nfp/meson.build
index 21b20c9ac9..766e9c737a 100644
--- a/drivers/net/nfp/meson.build
+++ b/drivers/net/nfp/meson.build
@@ -2,19 +2,19 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
+    build = false
+    reason = 'only supported on 64-bit Linux'
 endif
 sources = files('nfpcore/nfp_cpp_pcie_ops.c',
-	'nfpcore/nfp_nsp.c',
-	'nfpcore/nfp_cppcore.c',
-	'nfpcore/nfp_resource.c',
-	'nfpcore/nfp_mip.c',
-	'nfpcore/nfp_nffw.c',
-	'nfpcore/nfp_rtsym.c',
-	'nfpcore/nfp_nsp_cmds.c',
-	'nfpcore/nfp_crc.c',
-	'nfpcore/nfp_mutex.c',
-	'nfpcore/nfp_nsp_eth.c',
-	'nfpcore/nfp_hwinfo.c',
-	'nfp_net.c')
+    'nfpcore/nfp_nsp.c',
+    'nfpcore/nfp_cppcore.c',
+    'nfpcore/nfp_resource.c',
+    'nfpcore/nfp_mip.c',
+    'nfpcore/nfp_nffw.c',
+    'nfpcore/nfp_rtsym.c',
+    'nfpcore/nfp_nsp_cmds.c',
+    'nfpcore/nfp_crc.c',
+    'nfpcore/nfp_mutex.c',
+    'nfpcore/nfp_nsp_eth.c',
+    'nfpcore/nfp_hwinfo.c',
+    'nfp_net.c')
diff --git a/drivers/net/null/meson.build b/drivers/net/null/meson.build
index d9fb88fd7d..0251578aab 100644
--- a/drivers/net/null/meson.build
+++ b/drivers/net/null/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files('rte_eth_null.c')
diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index b8fe4b3013..0a69dfd467 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = [
-	'octeontx_pkovf.c',
-	'octeontx_pkivf.c',
-	'octeontx_bgx.c'
+        'octeontx_pkovf.c',
+        'octeontx_pkivf.c',
+        'octeontx_bgx.c'
 ]
 
 depends = ['ethdev', 'mempool_octeontx']
 static_objs = []
 foreach d: depends
-	if not is_variable('shared_rte_' + d)
-		subdir_done()
-	endif
-	static_objs += get_variable('static_rte_' + d)
+    if not is_variable('shared_rte_' + d)
+        subdir_done()
+    endif
+    static_objs += get_variable('static_rte_' + d)
 endforeach
 
 c_args = cflags
 base_lib = static_library('octeontx_base', sources,
-	c_args: c_args,
-	dependencies: static_objs,
+    c_args: c_args,
+    dependencies: static_objs,
 )
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/octeontx/meson.build b/drivers/net/octeontx/meson.build
index 4e784b9484..1baac97688 100644
--- a/drivers/net/octeontx/meson.build
+++ b/drivers/net/octeontx/meson.build
@@ -2,18 +2,18 @@
 # Copyright(c) 2017 Cavium, Inc
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files('octeontx_rxtx.c',
-		'octeontx_ethdev.c',
-		'octeontx_ethdev_ops.c'
-		)
+        'octeontx_ethdev.c',
+        'octeontx_ethdev_ops.c'
+        )
 
 deps += ['mempool_octeontx', 'eventdev']
 
diff --git a/drivers/net/octeontx2/meson.build b/drivers/net/octeontx2/meson.build
index 779a75b5d0..fbcdd61e14 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -3,49 +3,49 @@
 #
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    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'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit'
+    subdir_done()
 endif
 
 sources = files('otx2_rx.c',
-		'otx2_tx.c',
-		'otx2_tm.c',
-		'otx2_rss.c',
-		'otx2_mac.c',
-		'otx2_ptp.c',
-		'otx2_flow.c',
-		'otx2_link.c',
-		'otx2_vlan.c',
-		'otx2_stats.c',
-		'otx2_mcast.c',
-		'otx2_lookup.c',
-		'otx2_ethdev.c',
-		'otx2_flow_ctrl.c',
-		'otx2_flow_dump.c',
-		'otx2_flow_parse.c',
-		'otx2_flow_utils.c',
-		'otx2_ethdev_irq.c',
-		'otx2_ethdev_ops.c',
-		'otx2_ethdev_sec.c',
-		'otx2_ethdev_debug.c',
-		'otx2_ethdev_devargs.c'
-		)
+        'otx2_tx.c',
+        'otx2_tm.c',
+        'otx2_rss.c',
+        'otx2_mac.c',
+        'otx2_ptp.c',
+        'otx2_flow.c',
+        'otx2_link.c',
+        'otx2_vlan.c',
+        'otx2_stats.c',
+        'otx2_mcast.c',
+        'otx2_lookup.c',
+        'otx2_ethdev.c',
+        'otx2_flow_ctrl.c',
+        'otx2_flow_dump.c',
+        'otx2_flow_parse.c',
+        'otx2_flow_utils.c',
+        'otx2_ethdev_irq.c',
+        'otx2_ethdev_ops.c',
+        'otx2_ethdev_sec.c',
+        'otx2_ethdev_debug.c',
+        'otx2_ethdev_devargs.c'
+        )
 
 deps += ['bus_pci', 'cryptodev', 'eventdev', 'security']
 deps += ['common_octeontx2', 'mempool_octeontx2']
 
 extra_flags = ['-flax-vector-conversions']
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 includes += include_directories('../../common/cpt')
diff --git a/drivers/net/octeontx_ep/meson.build b/drivers/net/octeontx_ep/meson.build
index a8436f35f2..ccadcc8732 100644
--- a/drivers/net/octeontx_ep/meson.build
+++ b/drivers/net/octeontx_ep/meson.build
@@ -4,10 +4,10 @@
 
 deps += ['common_octeontx2']
 sources = files(
-               'otx_ep_ethdev.c',
-               'otx_ep_vf.c',
-               'otx2_ep_vf.c',
-               'otx_ep_rxtx.c',
+        'otx_ep_ethdev.c',
+        'otx_ep_vf.c',
+        'otx2_ep_vf.c',
+        'otx_ep_rxtx.c',
                )
 
 includes += include_directories('../../common/octeontx2')
diff --git a/drivers/net/pcap/meson.build b/drivers/net/pcap/meson.build
index b65d91e70a..61c0551582 100644
--- a/drivers/net/pcap/meson.build
+++ b/drivers/net/pcap/meson.build
@@ -2,14 +2,14 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if not dpdk_conf.has('RTE_PORT_PCAP')
-	build = false
-	reason = 'missing dependency, "libpcap"'
+    build = false
+    reason = 'missing dependency, "libpcap"'
 endif
 sources = files('rte_eth_pcap.c')
 ext_deps += pcap_dep
diff --git a/drivers/net/pfe/meson.build b/drivers/net/pfe/meson.build
index da0787c28c..811053ae90 100644
--- a/drivers/net/pfe/meson.build
+++ b/drivers/net/pfe/meson.build
@@ -2,18 +2,18 @@
 # Copyright 2019 NXP
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 deps += ['common_dpaax']
 
 sources = files('pfe_ethdev.c',
-		'pfe_hal.c',
-		'pfe_hif_lib.c',
-		'pfe_hif.c')
+        'pfe_hal.c',
+        'pfe_hif_lib.c',
+        'pfe_hif.c')
 
 if cc.has_argument('-Wno-pointer-arith')
-	cflags += '-Wno-pointer-arith'
+    cflags += '-Wno-pointer-arith'
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/qede/base/meson.build b/drivers/net/qede/base/meson.build
index 03a6c44f53..614a0c3808 100644
--- a/drivers/net/qede/base/meson.build
+++ b/drivers/net/qede/base/meson.build
@@ -2,47 +2,47 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources = [
-	'bcm_osal.c',
-	'ecore_cxt.c',
-	'ecore_dcbx.c',
-	'ecore_dev.c',
-	'ecore_hw.c',
-	'ecore_init_fw_funcs.c',
-	'ecore_init_ops.c',
-	'ecore_int.c',
-	'ecore_l2.c',
-	'ecore_mcp.c',
-	'ecore_sp_commands.c',
-	'ecore_spq.c',
-	'ecore_sriov.c',
-	'ecore_vf.c',
+        'bcm_osal.c',
+        'ecore_cxt.c',
+        'ecore_dcbx.c',
+        'ecore_dev.c',
+        'ecore_hw.c',
+        'ecore_init_fw_funcs.c',
+        'ecore_init_ops.c',
+        'ecore_int.c',
+        'ecore_l2.c',
+        'ecore_mcp.c',
+        'ecore_sp_commands.c',
+        'ecore_spq.c',
+        'ecore_sriov.c',
+        'ecore_vf.c',
 ]
 
 
 error_cflags = [
-	'-Wno-unused-parameter',
-	'-Wno-sign-compare',
-	'-Wno-missing-prototypes',
-	'-Wno-cast-qual',
-	'-Wno-unused-function',
-	'-Wno-unused-variable',
-	'-Wno-strict-aliasing',
-	'-Wno-missing-prototypes',
-	'-Wno-unused-value',
-	'-Wno-format-nonliteral',
-	'-Wno-shift-negative-value',
-	'-Wno-unused-but-set-variable',
-	'-Wno-missing-declarations',
-	'-Wno-maybe-uninitialized',
-	'-Wno-strict-prototypes',
-	'-Wno-shift-negative-value',
-	'-Wno-implicit-fallthrough',
-	'-Wno-format-extra-args',
-	'-Wno-visibility',
-	'-Wno-empty-body',
-	'-Wno-invalid-source-encoding',
-	'-Wno-sometimes-uninitialized',
-	'-Wno-pointer-bool-conversion',
+        '-Wno-unused-parameter',
+        '-Wno-sign-compare',
+        '-Wno-missing-prototypes',
+        '-Wno-cast-qual',
+        '-Wno-unused-function',
+        '-Wno-unused-variable',
+        '-Wno-strict-aliasing',
+        '-Wno-missing-prototypes',
+        '-Wno-unused-value',
+        '-Wno-format-nonliteral',
+        '-Wno-shift-negative-value',
+        '-Wno-unused-but-set-variable',
+        '-Wno-missing-declarations',
+        '-Wno-maybe-uninitialized',
+        '-Wno-strict-prototypes',
+        '-Wno-shift-negative-value',
+        '-Wno-implicit-fallthrough',
+        '-Wno-format-extra-args',
+        '-Wno-visibility',
+        '-Wno-empty-body',
+        '-Wno-invalid-source-encoding',
+        '-Wno-sometimes-uninitialized',
+        '-Wno-pointer-bool-conversion',
 ]
 c_args = cflags
 foreach flag: error_cflags
@@ -52,6 +52,6 @@ foreach flag: error_cflags
 endforeach
 
 base_lib = static_library('qede_base', sources,
-	dependencies: [static_rte_net, static_rte_bus_pci],
-	c_args: c_args)
+    dependencies: [static_rte_net, static_rte_bus_pci],
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/qede/meson.build b/drivers/net/qede/meson.build
index 05ce69560b..6591a883ed 100644
--- a/drivers/net/qede/meson.build
+++ b/drivers/net/qede/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'qede_ethdev.c',
-	'qede_filter.c',
-	'qede_main.c',
-	'qede_rxtx.c',
-	'qede_debug.c',
-	'qede_regs.c',
-	'qede_sriov.c',
+        'qede_ethdev.c',
+        'qede_filter.c',
+        'qede_main.c',
+        'qede_rxtx.c',
+        'qede_debug.c',
+        'qede_regs.c',
+        'qede_sriov.c',
 )
 
 if cc.has_argument('-Wno-format-nonliteral')
-	cflags += '-Wno-format-nonliteral'
+    cflags += '-Wno-format-nonliteral'
 endif
diff --git a/drivers/net/ring/meson.build b/drivers/net/ring/meson.build
index fb6a5f7d66..0156b37aad 100644
--- a/drivers/net/ring/meson.build
+++ b/drivers/net/ring/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources = files('rte_eth_ring.c')
diff --git a/drivers/net/sfc/meson.build b/drivers/net/sfc/meson.build
index 0c5cfb9058..b58425bf99 100644
--- a/drivers/net/sfc/meson.build
+++ b/drivers/net/sfc/meson.build
@@ -7,14 +7,14 @@
 # for Solarflare) and Solarflare Communications, Inc.
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 if (arch_subdir != 'x86' or not dpdk_conf.get('RTE_ARCH_64')) and (arch_subdir != 'arm' or not host_machine.cpu_family().startswith('aarch64'))
-	build = false
-	reason = 'only supported on x86_64 and aarch64'
+    build = false
+    reason = 'only supported on x86_64 and aarch64'
 endif
 
 extra_flags = []
@@ -24,42 +24,42 @@ extra_flags += '-Wno-strict-aliasing'
 
 # Enable more warnings
 extra_flags += [
-	'-Wdisabled-optimization'
+        '-Wdisabled-optimization'
 ]
 
 # Compiler and version dependent flags
 extra_flags += [
-	'-Waggregate-return',
-	'-Wbad-function-cast'
+        '-Waggregate-return',
+        '-Wbad-function-cast'
 ]
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
 
 deps += ['common_sfc_efx', 'bus_pci']
 sources = files(
-	'sfc_ethdev.c',
-	'sfc_kvargs.c',
-	'sfc.c',
-	'sfc_mcdi.c',
-	'sfc_sriov.c',
-	'sfc_intr.c',
-	'sfc_ev.c',
-	'sfc_port.c',
-	'sfc_rx.c',
-	'sfc_tx.c',
-	'sfc_tso.c',
-	'sfc_filter.c',
-	'sfc_switch.c',
-	'sfc_mae.c',
-	'sfc_flow.c',
-	'sfc_dp.c',
-	'sfc_ef10_rx.c',
-	'sfc_ef10_essb_rx.c',
-	'sfc_ef10_tx.c',
-	'sfc_ef100_rx.c',
-	'sfc_ef100_tx.c',
+        'sfc_ethdev.c',
+        'sfc_kvargs.c',
+        'sfc.c',
+        'sfc_mcdi.c',
+        'sfc_sriov.c',
+        'sfc_intr.c',
+        'sfc_ev.c',
+        'sfc_port.c',
+        'sfc_rx.c',
+        'sfc_tx.c',
+        'sfc_tso.c',
+        'sfc_filter.c',
+        'sfc_switch.c',
+        'sfc_mae.c',
+        'sfc_flow.c',
+        'sfc_dp.c',
+        'sfc_ef10_rx.c',
+        'sfc_ef10_essb_rx.c',
+        'sfc_ef10_tx.c',
+        'sfc_ef100_rx.c',
+        'sfc_ef100_tx.c',
 )
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index e31bdece7b..0bde03a0c3 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -2,23 +2,23 @@
 # Copyright(c) 2018 Intel Corporation
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 headers = files('rte_eth_softnic.h')
 sources = files('rte_eth_softnic_tm.c',
-	'rte_eth_softnic.c',
-	'rte_eth_softnic_mempool.c',
-	'rte_eth_softnic_swq.c',
-	'rte_eth_softnic_link.c',
-	'rte_eth_softnic_tap.c',
-	'rte_eth_softnic_action.c',
-	'rte_eth_softnic_pipeline.c',
-	'rte_eth_softnic_thread.c',
-	'rte_eth_softnic_cli.c',
-	'rte_eth_softnic_flow.c',
-	'rte_eth_softnic_meter.c',
-	'rte_eth_softnic_cryptodev.c',
-	'parser.c',
-	'conn.c')
+    'rte_eth_softnic.c',
+    'rte_eth_softnic_mempool.c',
+    'rte_eth_softnic_swq.c',
+    'rte_eth_softnic_link.c',
+    'rte_eth_softnic_tap.c',
+    'rte_eth_softnic_action.c',
+    'rte_eth_softnic_pipeline.c',
+    'rte_eth_softnic_thread.c',
+    'rte_eth_softnic_cli.c',
+    'rte_eth_softnic_flow.c',
+    'rte_eth_softnic_meter.c',
+    'rte_eth_softnic_cryptodev.c',
+    'parser.c',
+    'conn.c')
 deps += ['pipeline', 'port', 'table', 'sched', 'cryptodev']
diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build
index 4f8f3325f6..dd288bfac8 100644
--- a/drivers/net/szedata2/meson.build
+++ b/drivers/net/szedata2/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 dep = dependency('libsze2', required: false, method: 'pkg-config')
diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build
index d51bd3190d..43fd7775e6 100644
--- a/drivers/net/tap/meson.build
+++ b/drivers/net/tap/meson.build
@@ -2,16 +2,16 @@
 # Copyright 2018 Luca Boccassi <bluca@debian.org>
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files(
-	'rte_eth_tap.c',
-	'tap_bpf_api.c',
-	'tap_flow.c',
-	'tap_intr.c',
-	'tap_netlink.c',
-	'tap_tcmsgs.c',
+        'rte_eth_tap.c',
+        'tap_bpf_api.c',
+        'tap_flow.c',
+        'tap_intr.c',
+        'tap_netlink.c',
+        'tap_tcmsgs.c',
 )
 
 deps = ['bus_vdev', 'gso', 'hash']
@@ -25,21 +25,15 @@ cflags += '-DTAP_MAX_QUEUES=16'
 #   "enum/define", "symbol to search" ]
 #
 args = [
-	[ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h',
-	  'TCA_FLOWER_UNSPEC' ],
-	[ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h',
-	  'TCA_FLOWER_KEY_VLAN_PRIO' ],
-	[ 'HAVE_TC_BPF', 'linux/pkt_cls.h',
-	  'TCA_BPF_UNSPEC' ],
-	[ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h',
-	  'TCA_BPF_FD' ],
-	[ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h',
-	  'TCA_ACT_BPF_UNSPEC' ],
-	[ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h',
-	  'TCA_ACT_BPF_FD' ],
+        [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h', 'TCA_FLOWER_UNSPEC' ],
+        [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h', 'TCA_FLOWER_KEY_VLAN_PRIO' ],
+        [ 'HAVE_TC_BPF', 'linux/pkt_cls.h', 'TCA_BPF_UNSPEC' ],
+        [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h', 'TCA_BPF_FD' ],
+        [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h', 'TCA_ACT_BPF_UNSPEC' ],
+        [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h', 'TCA_ACT_BPF_FD' ],
 ]
 config = configuration_data()
 foreach arg:args
-	config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
+    config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))
 endforeach
 configure_file(output : 'tap_autoconf.h', configuration : config)
diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build
index 8998264a3a..9cf4bf553a 100644
--- a/drivers/net/thunderx/base/meson.build
+++ b/drivers/net/thunderx/base/meson.build
@@ -2,15 +2,15 @@
 # Copyright(c) 2017 Cavium, Inc
 
 sources = [
-	'nicvf_hw.c',
-	'nicvf_mbox.c',
-	'nicvf_bsvf.c'
+        'nicvf_hw.c',
+        'nicvf_mbox.c',
+        'nicvf_bsvf.c'
 ]
 
 c_args = cflags
 base_lib = static_library('nicvf_base', sources,
-	c_args: c_args,
-	dependencies: static_rte_ethdev
+    c_args: c_args,
+    dependencies: static_rte_ethdev
 )
 
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/thunderx/meson.build b/drivers/net/thunderx/meson.build
index dad5c59242..468a450ec0 100644
--- a/drivers/net/thunderx/meson.build
+++ b/drivers/net/thunderx/meson.build
@@ -2,25 +2,25 @@
 # Copyright(c) 2017 Cavium, Inc
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files('nicvf_rxtx.c',
-		'nicvf_ethdev.c',
-		'nicvf_svf.c'
+        'nicvf_ethdev.c',
+        'nicvf_svf.c'
 )
 
 if cc.has_argument('-fno-prefetch-loop-arrays')
-	cflags += '-fno-prefetch-loop-arrays'
+    cflags += '-fno-prefetch-loop-arrays'
 endif
 
 if cc.has_argument('-Wno-maybe-uninitialized')
-	cflags += '-Wno-maybe-uninitialized'
+    cflags += '-Wno-maybe-uninitialized'
 endif
 
 includes += include_directories('base')
diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build
index 33d0adf0d6..94db39ce2e 100644
--- a/drivers/net/txgbe/base/meson.build
+++ b/drivers/net/txgbe/base/meson.build
@@ -2,26 +2,26 @@
 # Copyright(c) 2015-2020
 
 sources = [
-	'txgbe_dcb_hw.c',
-	'txgbe_dcb.c',
-	'txgbe_eeprom.c',
-	'txgbe_hw.c',
-	'txgbe_mbx.c',
-	'txgbe_mng.c',
-	'txgbe_phy.c',
-	'txgbe_vf.c',
+        'txgbe_dcb_hw.c',
+        'txgbe_dcb.c',
+        'txgbe_eeprom.c',
+        'txgbe_hw.c',
+        'txgbe_mbx.c',
+        'txgbe_mng.c',
+        'txgbe_phy.c',
+        'txgbe_vf.c',
 ]
 
 error_cflags = []
 
 c_args = cflags
 foreach flag: error_cflags
-	if cc.has_argument(flag)
-		c_args += flag
-	endif
+    if cc.has_argument(flag)
+        c_args += flag
+    endif
 endforeach
 
 base_lib = static_library('txgbe_base', sources,
-	dependencies: static_rte_eal,
-	c_args: c_args)
+    dependencies: static_rte_eal,
+    c_args: c_args)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build
index 3b9994aa97..5fbbbd56f1 100644
--- a/drivers/net/txgbe/meson.build
+++ b/drivers/net/txgbe/meson.build
@@ -2,24 +2,24 @@
 # Copyright(c) 2015-2020
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 sources = files(
-	'txgbe_ethdev.c',
-	'txgbe_ethdev_vf.c',
-	'txgbe_fdir.c',
-	'txgbe_flow.c',
-	'txgbe_ipsec.c',
-	'txgbe_ptypes.c',
-	'txgbe_pf.c',
-	'txgbe_rxtx.c',
-	'txgbe_tm.c',
+        'txgbe_ethdev.c',
+        'txgbe_ethdev_vf.c',
+        'txgbe_fdir.c',
+        'txgbe_flow.c',
+        'txgbe_ipsec.c',
+        'txgbe_ptypes.c',
+        'txgbe_pf.c',
+        'txgbe_rxtx.c',
+        'txgbe_tm.c',
 )
 
 deps += ['hash', 'security']
diff --git a/drivers/net/vdev_netvsc/meson.build b/drivers/net/vdev_netvsc/meson.build
index 49d3a2c7bb..b20a053bc2 100644
--- a/drivers/net/vdev_netvsc/meson.build
+++ b/drivers/net/vdev_netvsc/meson.build
@@ -2,8 +2,8 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
+    build = false
+    reason = 'only supported on Linux'
 endif
 sources = files('vdev_netvsc.c')
 
diff --git a/drivers/net/vhost/meson.build b/drivers/net/vhost/meson.build
index 804b7a1dd1..858b79fdf5 100644
--- a/drivers/net/vhost/meson.build
+++ b/drivers/net/vhost/meson.build
@@ -2,9 +2,9 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 build = dpdk_conf.has('RTE_LIB_VHOST')
diff --git a/drivers/net/virtio/meson.build b/drivers/net/virtio/meson.build
index d595cfdcab..06bd0b6edc 100644
--- a/drivers/net/virtio/meson.build
+++ b/drivers/net/virtio/meson.build
@@ -2,54 +2,54 @@
 # Copyright(c) 2018 Intel Corporation
 
 if is_windows
-	build = false
-	reason = 'not supported on Windows'
-	subdir_done()
+    build = false
+    reason = 'not supported on Windows'
+    subdir_done()
 endif
 
 sources += files('virtio.c',
-	'virtio_ethdev.c',
-	'virtio_pci_ethdev.c',
-	'virtio_pci.c',
-	'virtio_rxtx.c',
-	'virtio_rxtx_simple.c',
-	'virtqueue.c')
+    'virtio_ethdev.c',
+    'virtio_pci_ethdev.c',
+    'virtio_pci.c',
+    'virtio_rxtx.c',
+    'virtio_rxtx_simple.c',
+    'virtqueue.c')
 deps += ['kvargs', 'bus_pci']
 
 if arch_subdir == 'x86'
-	if not machine_args.contains('-mno-avx512f')
-		if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
-			cflags += ['-DCC_AVX512_SUPPORT']
-			virtio_avx512_lib = static_library('virtio_avx512_lib',
-					      'virtio_rxtx_packed.c',
-					      dependencies: [static_rte_ethdev,
-						static_rte_kvargs, static_rte_bus_pci],
-					      include_directories: includes,
-					      c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
-			objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
-			if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
-				cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
-			elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
-				cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
-			elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
-				cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
-			endif
-		endif
-	endif
-	sources += files('virtio_rxtx_simple_sse.c')
+    if not machine_args.contains('-mno-avx512f')
+        if cc.has_argument('-mavx512f') and cc.has_argument('-mavx512vl') and cc.has_argument('-mavx512bw')
+            cflags += ['-DCC_AVX512_SUPPORT']
+            virtio_avx512_lib = static_library('virtio_avx512_lib',
+                          'virtio_rxtx_packed.c',
+                          dependencies: [static_rte_ethdev,
+                        static_rte_kvargs, static_rte_bus_pci],
+                          include_directories: includes,
+                          c_args: [cflags, '-mavx512f', '-mavx512bw', '-mavx512vl'])
+            objs += virtio_avx512_lib.extract_objects('virtio_rxtx_packed.c')
+            if (toolchain == 'gcc' and cc.version().version_compare('>=8.3.0'))
+                cflags += '-DVHOST_GCC_UNROLL_PRAGMA'
+            elif (toolchain == 'clang' and cc.version().version_compare('>=3.7.0'))
+                cflags += '-DVHOST_CLANG_UNROLL_PRAGMA'
+            elif (toolchain == 'icc' and cc.version().version_compare('>=16.0.0'))
+                cflags += '-DVHOST_ICC_UNROLL_PRAGMA'
+            endif
+        endif
+    endif
+    sources += files('virtio_rxtx_simple_sse.c')
 elif arch_subdir == 'ppc'
-	sources += files('virtio_rxtx_simple_altivec.c')
+    sources += files('virtio_rxtx_simple_altivec.c')
 elif arch_subdir == 'arm' and host_machine.cpu_family().startswith('aarch64')
-	sources += files('virtio_rxtx_packed.c')
-	sources += files('virtio_rxtx_simple_neon.c')
+    sources += files('virtio_rxtx_packed.c')
+    sources += files('virtio_rxtx_simple_neon.c')
 endif
 
 if is_linux
-	sources += files('virtio_user_ethdev.c',
-		'virtio_user/vhost_kernel.c',
-		'virtio_user/vhost_kernel_tap.c',
-		'virtio_user/vhost_user.c',
-		'virtio_user/vhost_vdpa.c',
-		'virtio_user/virtio_user_dev.c')
-	deps += ['bus_vdev']
+    sources += files('virtio_user_ethdev.c',
+        'virtio_user/vhost_kernel.c',
+        'virtio_user/vhost_kernel_tap.c',
+        'virtio_user/vhost_user.c',
+        'virtio_user/vhost_vdpa.c',
+        'virtio_user/virtio_user_dev.c')
+    deps += ['bus_vdev']
 endif
diff --git a/drivers/net/vmxnet3/meson.build b/drivers/net/vmxnet3/meson.build
index 0641f776ff..ed563386d5 100644
--- a/drivers/net/vmxnet3/meson.build
+++ b/drivers/net/vmxnet3/meson.build
@@ -2,13 +2,15 @@
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
 sources += files(
-	'vmxnet3_ethdev.c',
-	'vmxnet3_rxtx.c',
+        'vmxnet3_ethdev.c',
+        'vmxnet3_rxtx.c',
 )
 
 error_cflags = [
-		'-Wno-unused-parameter', '-Wno-unused-value',
-                '-Wno-strict-aliasing', '-Wno-format-extra-args',
+        '-Wno-unused-parameter',
+        '-Wno-unused-value',
+        '-Wno-strict-aliasing',
+        '-Wno-format-extra-args',
 ]
 foreach flag: error_cflags
         if cc.has_argument(flag)
diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build
index 3549afafa1..8d27c60213 100644
--- a/drivers/raw/ifpga/base/meson.build
+++ b/drivers/raw/ifpga/base/meson.build
@@ -2,42 +2,42 @@
 # Copyright(c) 2018 Intel Corporation
 
 sources = [
-	'ifpga_api.c',
-	'ifpga_enumerate.c',
-	'ifpga_feature_dev.c',
-	'ifpga_fme.c',
-	'ifpga_fme_iperf.c',
-	'ifpga_fme_dperf.c',
-	'ifpga_fme_error.c',
-	'ifpga_port.c',
-	'ifpga_port_error.c',
-	'ifpga_fme_pr.c',
-	'ifpga_fme_rsu.c',
-	'ifpga_sec_mgr.c',
-	'opae_hw_api.c',
-	'opae_ifpga_hw_api.c',
-	'opae_debug.c',
-	'opae_spi.c',
-	'opae_spi_transaction.c',
-	'opae_intel_max10.c',
-	'opae_i2c.c',
-	'opae_at24_eeprom.c',
-	'opae_eth_group.c',
+        'ifpga_api.c',
+        'ifpga_enumerate.c',
+        'ifpga_feature_dev.c',
+        'ifpga_fme.c',
+        'ifpga_fme_iperf.c',
+        'ifpga_fme_dperf.c',
+        'ifpga_fme_error.c',
+        'ifpga_port.c',
+        'ifpga_port_error.c',
+        'ifpga_fme_pr.c',
+        'ifpga_fme_rsu.c',
+        'ifpga_sec_mgr.c',
+        'opae_hw_api.c',
+        'opae_ifpga_hw_api.c',
+        'opae_debug.c',
+        'opae_spi.c',
+        'opae_spi_transaction.c',
+        'opae_intel_max10.c',
+        'opae_i2c.c',
+        'opae_at24_eeprom.c',
+        'opae_eth_group.c',
 ]
 
 rtdep = dependency('librt', required: false)
 if not rtdep.found()
-	rtdep = cc.find_library('librt', required: false)
+    rtdep = cc.find_library('librt', required: false)
 endif
 if not rtdep.found()
-	build = false
-	reason = 'missing dependency, "librt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "librt"'
+    subdir_done()
 endif
 
 ext_deps += rtdep
 
 base_lib = static_library('ifpga_rawdev_base', sources,
-	dependencies: static_rte_eal,
-	c_args: cflags)
+    dependencies: static_rte_eal,
+    c_args: cflags)
 base_objs = base_lib.extract_all_objects()
diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build
index 60ea59ae28..aeccc1796d 100644
--- a/drivers/raw/ifpga/meson.build
+++ b/drivers/raw/ifpga/meson.build
@@ -2,16 +2,16 @@
 # Copyright(c) 2018 Intel Corporation
 
 if has_libfdt == 0
-	build = false
-	reason = 'missing dependency, "libfdt"'
-	subdir_done()
+    build = false
+    reason = 'missing dependency, "libfdt"'
+    subdir_done()
 endif
 
 subdir('base')
 objs = [base_objs]
 
 deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs',
-	'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
+    'bus_vdev', 'bus_ifpga', 'net', 'net_i40e', 'net_ipn3ke']
 
 sources = files('ifpga_rawdev.c', 'rte_pmd_ifpga.c')
 
diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build
index 6fbae05b78..47633f2795 100644
--- a/drivers/raw/ioat/meson.build
+++ b/drivers/raw/ioat/meson.build
@@ -4,15 +4,15 @@
 build = dpdk_conf.has('RTE_ARCH_X86')
 reason = 'only supported on x86'
 sources = files(
-	'idxd_pci.c',
-	'idxd_vdev.c',
-	'ioat_common.c',
-	'ioat_rawdev.c',
-	'ioat_rawdev_test.c')
+        'idxd_pci.c',
+        'idxd_vdev.c',
+        'ioat_common.c',
+        'ioat_rawdev.c',
+    'ioat_rawdev_test.c')
 deps += ['bus_pci',
-	'bus_vdev',
-	'mbuf',
-	'rawdev']
+    'bus_vdev',
+    'mbuf',
+    'rawdev']
 
 headers = files('rte_ioat_rawdev.h',
-		'rte_ioat_rawdev_fns.h')
+        'rte_ioat_rawdev_fns.h')
diff --git a/drivers/raw/ntb/meson.build b/drivers/raw/ntb/meson.build
index 1b7c6eb449..bfe0b0e366 100644
--- a/drivers/raw/ntb/meson.build
+++ b/drivers/raw/ntb/meson.build
@@ -2,7 +2,7 @@
 # Copyright(c) 2019 Intel Corporation.
 
 deps += ['rawdev', 'mbuf', 'mempool',
-	 'pci', 'bus_pci']
+     'pci', 'bus_pci']
 sources = files('ntb.c',
                 'ntb_hw_intel.c')
 headers = files('rte_pmd_ntb.h')
diff --git a/drivers/raw/octeontx2_dma/meson.build b/drivers/raw/octeontx2_dma/meson.build
index 11f74680a5..e744fccaae 100644
--- a/drivers/raw/octeontx2_dma/meson.build
+++ b/drivers/raw/octeontx2_dma/meson.build
@@ -8,11 +8,11 @@ sources = files('otx2_dpi_rawdev.c', 'otx2_dpi_msg.c', 'otx2_dpi_test.c')
 extra_flags = []
 # This integrated controller runs only on a arm64 machine, remove 32bit warnings
 if not dpdk_conf.get('RTE_ARCH_64')
-	extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
+    extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
 endif
 
 foreach flag: extra_flags
-	if cc.has_argument(flag)
-		cflags += flag
-	endif
+    if cc.has_argument(flag)
+        cflags += flag
+    endif
 endforeach
diff --git a/drivers/raw/octeontx2_ep/meson.build b/drivers/raw/octeontx2_ep/meson.build
index 0e6338f76b..fed71db5e8 100644
--- a/drivers/raw/octeontx2_ep/meson.build
+++ b/drivers/raw/octeontx2_ep/meson.build
@@ -4,6 +4,6 @@
 
 deps += ['bus_pci', 'common_octeontx2', 'rawdev']
 sources = files('otx2_ep_rawdev.c',
-		'otx2_ep_enqdeq.c',
-		'otx2_ep_test.c',
-		'otx2_ep_vf.c')
+        'otx2_ep_enqdeq.c',
+        'otx2_ep_test.c',
+        'otx2_ep_vf.c')
diff --git a/drivers/regex/mlx5/meson.build b/drivers/regex/mlx5/meson.build
index 87e9611812..888ac5a8de 100644
--- a/drivers/regex/mlx5/meson.build
+++ b/drivers/regex/mlx5/meson.build
@@ -2,28 +2,28 @@
 # Copyright 2020 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 deps += ['common_mlx5', 'eal', 'regexdev']
 sources = files(
-	'mlx5_regex.c',
-	'mlx5_rxp.c',
-	'mlx5_regex_devx.c',
-	'mlx5_regex_control.c',
-	'mlx5_regex_fastpath.c',
+        'mlx5_regex.c',
+        'mlx5_rxp.c',
+        'mlx5_regex_devx.c',
+        'mlx5_regex_control.c',
+        'mlx5_regex_fastpath.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
diff --git a/drivers/regex/octeontx2/meson.build b/drivers/regex/octeontx2/meson.build
index 6ccc8589a7..55af764b90 100644
--- a/drivers/regex/octeontx2/meson.build
+++ b/drivers/regex/octeontx2/meson.build
@@ -3,24 +3,24 @@
 #
 
 if not is_linux or not dpdk_conf.get('RTE_ARCH_64')
-	build = false
-	reason = 'only supported on 64-bit Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on 64-bit Linux'
+    subdir_done()
 endif
 
 lib = cc.find_library('librxp_compiler', required: false)
 if lib.found()
-	ext_deps += lib
-	ext_deps += cc.find_library('libstdc++', required: true)
-	includes += include_directories(inc_dir)
-	cflags += ['-DREE_COMPILER_SDK']
+    ext_deps += lib
+    ext_deps += cc.find_library('libstdc++', required: true)
+    includes += include_directories(inc_dir)
+    cflags += ['-DREE_COMPILER_SDK']
 endif
 
 sources = files('otx2_regexdev.c',
-		'otx2_regexdev_hw_access.c',
-		'otx2_regexdev_mbox.c',
-		'otx2_regexdev_compiler.c'
-		)
+        'otx2_regexdev_hw_access.c',
+        'otx2_regexdev_mbox.c',
+        'otx2_regexdev_compiler.c'
+        )
 
 deps += ['bus_pci', 'common_octeontx2', 'regexdev']
 
diff --git a/drivers/vdpa/mlx5/meson.build b/drivers/vdpa/mlx5/meson.build
index a83ca86b3f..8335e39b9d 100644
--- a/drivers/vdpa/mlx5/meson.build
+++ b/drivers/vdpa/mlx5/meson.build
@@ -2,35 +2,35 @@
 # Copyright 2019 Mellanox Technologies, Ltd
 
 if not is_linux
-	build = false
-	reason = 'only supported on Linux'
-	subdir_done()
+    build = false
+    reason = 'only supported on Linux'
+    subdir_done()
 endif
 
 deps += ['hash', 'common_mlx5', 'vhost', 'pci', 'eal', 'sched']
 sources = files(
-	'mlx5_vdpa.c',
-	'mlx5_vdpa_mem.c',
-	'mlx5_vdpa_event.c',
-	'mlx5_vdpa_virtq.c',
-	'mlx5_vdpa_steer.c',
-	'mlx5_vdpa_lm.c',
+        'mlx5_vdpa.c',
+        'mlx5_vdpa_mem.c',
+        'mlx5_vdpa_event.c',
+        'mlx5_vdpa_virtq.c',
+        'mlx5_vdpa_steer.c',
+        'mlx5_vdpa_lm.c',
 )
 cflags_options = [
-	'-std=c11',
-	'-Wno-strict-prototypes',
-	'-D_BSD_SOURCE',
-	'-D_DEFAULT_SOURCE',
-	'-D_XOPEN_SOURCE=600'
+        '-std=c11',
+        '-Wno-strict-prototypes',
+        '-D_BSD_SOURCE',
+        '-D_DEFAULT_SOURCE',
+        '-D_XOPEN_SOURCE=600'
 ]
 foreach option:cflags_options
-	if cc.has_argument(option)
-		cflags += option
-	endif
+    if cc.has_argument(option)
+        cflags += option
+    endif
 endforeach
 
 if get_option('buildtype').contains('debug')
-	cflags += [ '-pedantic', '-DPEDANTIC' ]
+    cflags += [ '-pedantic', '-DPEDANTIC' ]
 else
-	cflags += [ '-UPEDANTIC' ]
+    cflags += [ '-UPEDANTIC' ]
 endif
